remove extension from script change_configuration
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Fri, 2 Oct 2015 20:17:41 +0000 (22:17 +0200)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Fri, 2 Oct 2015 20:17:41 +0000 (22:17 +0200)
master/etc/sudoers.d/pdmenu
master/etc/sudoers.d/webconfig
master/etc/webconfig/alias.d/50-trc6500-master-file.csv
master/opt/script/change_configuration [new file with mode: 0755]
master/opt/script/change_configuration.sh [deleted file]

index 0e63b174586f216ea2b1673d384a8103655aba14..4dfc51c696e0791aeff49ec98eb3dd8544e86ae8 100644 (file)
@@ -7,7 +7,7 @@ trc6500 ALL = (root)NOPASSWD: /usr/sbin/service ammwake *
 trc6500        ALL = (root)NOPASSWD: /usr/sbin/service ipmiwake *
 trc6500        ALL = (root)NOPASSWD: /usr/sbin/service trc6500 *
 trc6500        ALL = (root)NOPASSWD: /usr/bin/make *
-trc6500        ALL = (root)NOPASSWD: /opt/script/change_configuration.sh *
-trc6500        ALL = (root)NOPASSWD: /opt/trc6500/script/change_configuration.sh *
+trc6500        ALL = (root)NOPASSWD: /opt/script/change_configuration *
+trc6500        ALL = (root)NOPASSWD: /opt/trc6500/script/change_configuration *
 trc6500        ALL = (root)NOPASSWD: /root/bin/change_lgcore.sh *
 
index bafcccd969725d9b450e7b55f0bd6c04185ba2b4..3fb82d266d456868bbaf92d25b3bba63c6b4263e 100644 (file)
@@ -7,6 +7,6 @@ webconfig       ALL = (root)NOPASSWD: /usr/sbin/service ammwake *
 webconfig      ALL = (root)NOPASSWD: /usr/sbin/service ipmiwake *
 webconfig      ALL = (root)NOPASSWD: /usr/sbin/service trc6500 *
 webconfig      ALL = (root)NOPASSWD: /usr/bin/make *
-webconfig      ALL = (root)NOPASSWD: /opt/script/change_configuration.sh *
-webconfig      ALL = (root)NOPASSWD: /opt/trc6500/script/change_configuration.sh *
+webconfig      ALL = (root)NOPASSWD: /opt/script/change_configuration *
+webconfig      ALL = (root)NOPASSWD: /opt/trc6500/script/change_configuration *
 webconfig      ALL = (root)NOPASSWD: /root/bin/change_lgcore.sh *
index 1d50e0de237ab5f727f2e1da562981a9a4769294..d393d42e70413e4ccca5f3d19c42a33cd6e8644a 100644 (file)
@@ -65,16 +65,16 @@ ipmiwake;/usr/share/webconfig;;Power off all SuperMicro slaves;sudo service ipmi
 mediatray;/usr/share/webconfig;;Set media-tray to HS22 master blade;/opt/script/set_mediatray amm00 -b 1
 mediatray;/usr/share/webconfig;;Remove media-tray on HS22 chassis;/opt/script/set_mediatray amm00 -b 0 && /opt/script/set_mediatray amm01 -b 0
 ;;;Setup hardware actions;
-8mhzmhf;/usr/share/webconfig;;Setup 8MHzMHF mode;sudo /opt/script/change_configuration.sh 8MHzMHF
-12mhzdf;/usr/share/webconfig;;Setup 12MHzDF mode;sudo /opt/script/change_configuration.sh 12MHzDF
-12mhzmdf;/usr/share/webconfig;;Setup 12MHzMDF mode;sudo /opt/script/change_configuration.sh 12MHzMDF
-30mhzmdf;/usr/share/webconfig;;Setup 30MHzMDF mode;sudo /opt/script/change_configuration.sh 30MHzMDF
-30mhzmdf.lite;/usr/share/webconfig;;Setup 30MHzMDF lite mode;sudo /opt/script/change_configuration.sh 30MHzMDF.lite
-30mhzmhf;/usr/share/webconfig;;Setup 30MHzMHF mode;sudo /opt/script/change_configuration.sh 30MHzMHF
-hw_ibm;/usr/share/webconfig;;Setup IBM HS22 chassis mode;sudo /opt/script/change_configuration.sh hw_ibm
-hw_supermicro;/usr/share/webconfig;;Setup FatTwin Supermicro chassis mode;sudo /opt/script/change_configuration.sh hw_supermicro
-tz_zulu;/usr/share/webconfig;;Setup Zulu timezone;sudo /opt/script/change_configuration.sh tz_zulu
-tz_paris;/usr/share/webconfig;;Setup Europe/Paris timezone;sudo /opt/script/change_configuration.sh tz_paris
+8mhzmhf;/usr/share/webconfig;;Setup 8MHzMHF mode;sudo /opt/script/change_configuration 8MHzMHF
+12mhzdf;/usr/share/webconfig;;Setup 12MHzDF mode;sudo /opt/script/change_configuration 12MHzDF
+12mhzmdf;/usr/share/webconfig;;Setup 12MHzMDF mode;sudo /opt/script/change_configuration 12MHzMDF
+30mhzmdf;/usr/share/webconfig;;Setup 30MHzMDF mode;sudo /opt/script/change_configuration 30MHzMDF
+30mhzmdf.lite;/usr/share/webconfig;;Setup 30MHzMDF lite mode;sudo /opt/script/change_configuration 30MHzMDF.lite
+30mhzmhf;/usr/share/webconfig;;Setup 30MHzMHF mode;sudo /opt/script/change_configuration 30MHzMHF
+hw_ibm;/usr/share/webconfig;;Setup IBM HS22 chassis mode;sudo /opt/script/change_configuration hw_ibm
+hw_supermicro;/usr/share/webconfig;;Setup FatTwin Supermicro chassis mode;sudo /opt/script/change_configuration hw_supermicro
+tz_zulu;/usr/share/webconfig;;Setup Zulu timezone;sudo /opt/script/change_configuration tz_zulu
+tz_paris;/usr/share/webconfig;;Setup Europe/Paris timezone;sudo /opt/script/change_configuration tz_paris
 tarballs;/usr/share/webconfig;;Build tarballs;sudo make -f /opt/cluster/Makefile all
 ;;;Install LgCore actions;
 install-usb;/usr/share/webconfig;;Install LgCore from USB key;sudo /root/bin/change_lgcore.sh usb
diff --git a/master/opt/script/change_configuration b/master/opt/script/change_configuration
new file mode 100755 (executable)
index 0000000..ef715b7
--- /dev/null
@@ -0,0 +1,171 @@
+#!/bin/bash
+# ============================================================================
+#
+# Copyright (C) THALES. All rights reserved
+# Author: Laurent Mazet
+#
+
+# Date : 10/10/2013
+#
+# 05/11/2013 : LMa configuration des timezone Zulu(GMT) et Paris
+#              Desactivation de pam pour ssh
+# ============================================================================
+
+# Switch configuration
+
+# TODO
+# *
+
+MODE_BW=""
+MODE_FIX=""
+MODE_HW=""
+MODE_NET=""
+MODE_TZ=""
+TARBALLS=""
+PROGNAME=$(basename $0)
+VER=1.0
+TMPLOG=/tmp/$PROGNAME-$$.log
+
+# help function
+
+function usage () {
+  echo "usage: $PROGNAME <mode>"
+  echo "  switch trc6500 mode"
+  echo "  avaliable modes are:"
+  echo "  - 8MHzMHF, 12MHzDF, 12MHzMDF, 30MHzMDF 30MHzMDF.lite or 30MHzMHF"
+  echo "  - fix_ssh"
+  echo "  - hw_ibm or hw_supermicro"
+  echo "  - network"
+  echo "  - tz_zulu or tz_paris"
+  exit $@
+}
+
+# formating functions
+
+function title () { echo -e "\033[0;1m$*\033[0;0m"; }
+function pass () { echo -e "\033[1;32m$*\033[0;0m"; }
+function warn () { echo -e "\033[1;33m$*\033[0;0m"; }
+function fail () { echo -e "\033[1;31m$*\033[0;0m"; }
+
+# check command
+
+function check () {
+  echo -n "$@: "
+  $@ 2>$TMPLOG && pass OK || { fail KO; cat $TMPLOG; exit 1; }
+  rm -f $TMPLOG
+}
+
+# argument processing
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+    -h) usage 0;;
+    8mhz|8MHz|12mhzdf|12MHzDF|12mhzmdf|12MHzMDF|30mhzmdf|30MHzMDF|30mhzmdf.lite|30MHzMDF.lite|30mhzmhf|30MHzMHF)
+        MODE_BW="${1^^}"
+        MODE_BW=${MODE_BW/MHZ/MHz}
+        MODE_BW=${MODE_BW/LITE/lite}
+        ;;
+    fix_ssh) MODE_FIX="$1";;
+    hw_ibm|hw_supermicro) MODE_HW="$1";;
+    network) MODE_NET="$1";;
+    tz_paris|tz_zulu) MODE_TZ="$1";;
+    *) usage 1;;
+    esac
+    shift
+done
+
+# main process
+
+action=""
+
+if [ "$MODE_BW" ]; then
+    title "updating /etc/hosts"
+    check rm -f /etc/hosts 
+    check ln -s /etc/hosts.$MODE_BW /etc/hosts
+    TARBALLS+=" root"
+    for ip in 0A851{A,C}; do check ln -T -f -s default /opt/tftp/pxelinux.cfg/$ip; done
+    case "$MODE_BW" in
+    8MHzMHF)
+        for ip in 0A851{A,C}A5; do      check ln -T -f -s rec /opt/tftp/pxelinux.cfg/$ip; done
+    ;;
+    12MHzDF) ;;
+    12MHzMDF) ;;
+    30MHzMDF) ;;
+    30MHzMDF.lite)
+        for ip in 0A851{A,C}; do check ln -T -f -s lite /opt/tftp/pxelinux.cfg/$ip; done
+    ;;
+    30MHzMHF)
+        for ip in 0A851{A,C}A{1..6}; do check ln -T -f -s acq /opt/tftp/pxelinux.cfg/$ip; done
+        for ip in 0A851{A,C}A9; do      check ln -T -f -s rec /opt/tftp/pxelinux.cfg/$ip; done
+    ;;
+    esac
+    check cp /etc/dhcp/dhcpd.conf.$MODE_BW /etc/dhcp/dhcpd.conf
+    action="done"
+fi
+
+if [ "$MODE_FIX" ]; then
+
+    case "$MODE_FIX" in
+    fix_ssh)
+        sed -i 's/^\(UsePAM\) yes/\1 no/' /etc/ssh/sshd_config
+        TARBALLS+=" root"
+
+        action="done"
+    esac
+
+fi
+
+if [ "$MODE_HW" ]; then
+
+    conf=/etc/default/shutdownallblades
+
+    title "change shutdownallblades"
+    if $(grep -sq '^#*REBOOT=' $conf); then
+        case "$MODE_HW" in
+        hw_ibm) check sed -i 's/^#*REBOOT=.*$/#REBOOT=yes/' $conf;;
+        hw_supermicro) check sed -i 's/^#*REBOOT=.*$/REBOOT=yes/' $conf;;
+        esac
+    else
+        case "$MODE_HW" in
+        hw_ibm) check sed -i '$a#REBOOT=yes' $conf;;
+        hw_supermicro) check sed -i '$aREBOOT=yes' $conf;;
+        esac
+    fi
+
+    action="done"
+fi
+
+if [ "$MODE_NET" ]; then
+
+    conf=/etc/dhcp/dhcpd.conf
+
+    title "update network configuraton"
+    if $(grep -sq 'trc[0-9]*_1' $conf); then
+        check sed -i 's/\(host.*trc[0-9][0-9]\)\([^_]\)/\1-rf\2/;s/\(host.*trc[0-9][0-9]\)_1/\1/' $conf
+    fi
+    TARBALLS+=" root"
+
+    action="done"
+fi
+
+if [ "$MODE_TZ" ]; then
+    case "$MODE_TZ" in
+    tz_paris) TZ="Europe/Paris";;
+    tz_zulu) TZ="Etc/Zulu";;
+    *) TZ="";;
+    esac
+
+    if [ "$TZ" ]; then
+        echo $TZ > /etc/timezone
+        TARBALLS+=" root"
+
+        action="done"
+    fi
+fi
+
+# last check
+[ "$action" ] || { echo "no mode specified"; exit 1; }
+
+[ "$TARBALLS" ] && make -f /opt/cluster/Makefile $TARBALLS
+
+# vim:set tabstop=4 expandtab shiftwidth=4:
diff --git a/master/opt/script/change_configuration.sh b/master/opt/script/change_configuration.sh
deleted file mode 100755 (executable)
index ef715b7..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/bash
-# ============================================================================
-#
-# Copyright (C) THALES. All rights reserved
-# Author: Laurent Mazet
-#
-
-# Date : 10/10/2013
-#
-# 05/11/2013 : LMa configuration des timezone Zulu(GMT) et Paris
-#              Desactivation de pam pour ssh
-# ============================================================================
-
-# Switch configuration
-
-# TODO
-# *
-
-MODE_BW=""
-MODE_FIX=""
-MODE_HW=""
-MODE_NET=""
-MODE_TZ=""
-TARBALLS=""
-PROGNAME=$(basename $0)
-VER=1.0
-TMPLOG=/tmp/$PROGNAME-$$.log
-
-# help function
-
-function usage () {
-  echo "usage: $PROGNAME <mode>"
-  echo "  switch trc6500 mode"
-  echo "  avaliable modes are:"
-  echo "  - 8MHzMHF, 12MHzDF, 12MHzMDF, 30MHzMDF 30MHzMDF.lite or 30MHzMHF"
-  echo "  - fix_ssh"
-  echo "  - hw_ibm or hw_supermicro"
-  echo "  - network"
-  echo "  - tz_zulu or tz_paris"
-  exit $@
-}
-
-# formating functions
-
-function title () { echo -e "\033[0;1m$*\033[0;0m"; }
-function pass () { echo -e "\033[1;32m$*\033[0;0m"; }
-function warn () { echo -e "\033[1;33m$*\033[0;0m"; }
-function fail () { echo -e "\033[1;31m$*\033[0;0m"; }
-
-# check command
-
-function check () {
-  echo -n "$@: "
-  $@ 2>$TMPLOG && pass OK || { fail KO; cat $TMPLOG; exit 1; }
-  rm -f $TMPLOG
-}
-
-# argument processing
-
-while [ $# -gt 0 ]; do
-    case "$1" in
-    -h) usage 0;;
-    8mhz|8MHz|12mhzdf|12MHzDF|12mhzmdf|12MHzMDF|30mhzmdf|30MHzMDF|30mhzmdf.lite|30MHzMDF.lite|30mhzmhf|30MHzMHF)
-        MODE_BW="${1^^}"
-        MODE_BW=${MODE_BW/MHZ/MHz}
-        MODE_BW=${MODE_BW/LITE/lite}
-        ;;
-    fix_ssh) MODE_FIX="$1";;
-    hw_ibm|hw_supermicro) MODE_HW="$1";;
-    network) MODE_NET="$1";;
-    tz_paris|tz_zulu) MODE_TZ="$1";;
-    *) usage 1;;
-    esac
-    shift
-done
-
-# main process
-
-action=""
-
-if [ "$MODE_BW" ]; then
-    title "updating /etc/hosts"
-    check rm -f /etc/hosts 
-    check ln -s /etc/hosts.$MODE_BW /etc/hosts
-    TARBALLS+=" root"
-    for ip in 0A851{A,C}; do check ln -T -f -s default /opt/tftp/pxelinux.cfg/$ip; done
-    case "$MODE_BW" in
-    8MHzMHF)
-        for ip in 0A851{A,C}A5; do      check ln -T -f -s rec /opt/tftp/pxelinux.cfg/$ip; done
-    ;;
-    12MHzDF) ;;
-    12MHzMDF) ;;
-    30MHzMDF) ;;
-    30MHzMDF.lite)
-        for ip in 0A851{A,C}; do check ln -T -f -s lite /opt/tftp/pxelinux.cfg/$ip; done
-    ;;
-    30MHzMHF)
-        for ip in 0A851{A,C}A{1..6}; do check ln -T -f -s acq /opt/tftp/pxelinux.cfg/$ip; done
-        for ip in 0A851{A,C}A9; do      check ln -T -f -s rec /opt/tftp/pxelinux.cfg/$ip; done
-    ;;
-    esac
-    check cp /etc/dhcp/dhcpd.conf.$MODE_BW /etc/dhcp/dhcpd.conf
-    action="done"
-fi
-
-if [ "$MODE_FIX" ]; then
-
-    case "$MODE_FIX" in
-    fix_ssh)
-        sed -i 's/^\(UsePAM\) yes/\1 no/' /etc/ssh/sshd_config
-        TARBALLS+=" root"
-
-        action="done"
-    esac
-
-fi
-
-if [ "$MODE_HW" ]; then
-
-    conf=/etc/default/shutdownallblades
-
-    title "change shutdownallblades"
-    if $(grep -sq '^#*REBOOT=' $conf); then
-        case "$MODE_HW" in
-        hw_ibm) check sed -i 's/^#*REBOOT=.*$/#REBOOT=yes/' $conf;;
-        hw_supermicro) check sed -i 's/^#*REBOOT=.*$/REBOOT=yes/' $conf;;
-        esac
-    else
-        case "$MODE_HW" in
-        hw_ibm) check sed -i '$a#REBOOT=yes' $conf;;
-        hw_supermicro) check sed -i '$aREBOOT=yes' $conf;;
-        esac
-    fi
-
-    action="done"
-fi
-
-if [ "$MODE_NET" ]; then
-
-    conf=/etc/dhcp/dhcpd.conf
-
-    title "update network configuraton"
-    if $(grep -sq 'trc[0-9]*_1' $conf); then
-        check sed -i 's/\(host.*trc[0-9][0-9]\)\([^_]\)/\1-rf\2/;s/\(host.*trc[0-9][0-9]\)_1/\1/' $conf
-    fi
-    TARBALLS+=" root"
-
-    action="done"
-fi
-
-if [ "$MODE_TZ" ]; then
-    case "$MODE_TZ" in
-    tz_paris) TZ="Europe/Paris";;
-    tz_zulu) TZ="Etc/Zulu";;
-    *) TZ="";;
-    esac
-
-    if [ "$TZ" ]; then
-        echo $TZ > /etc/timezone
-        TARBALLS+=" root"
-
-        action="done"
-    fi
-fi
-
-# last check
-[ "$action" ] || { echo "no mode specified"; exit 1; }
-
-[ "$TARBALLS" ] && make -f /opt/cluster/Makefile $TARBALLS
-
-# vim:set tabstop=4 expandtab shiftwidth=4: