diff --git a/defaults.inc b/defaults.inc index d4f04e73..9cf8c97b 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.27-12152023' +VERS='2.5.28-12152023' noheader=' update service dailytemp confsync ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index af01d839..35ec0dfc 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -364,7 +364,7 @@ BATT VOLTAGE: ${BATTVOLT}'volts" fi if [ ! -f ${PW_TMPFOLDER}/power.ac.good ]; then - if [ -f ${PW_TMPFOLDER}/power.sys.off ] || [ -f ${PW_TMPFOLDER}/power.main.off ] || [ -f ${PW_TMPFOLDER}/power.ac.conserve ]; then + if [ -f ${PW_TMPFOLDER}/shutdown.SYS ] || [ -f ${PW_TMPFOLDER}/shutdown.MAIN ] || [ -f ${PW_TMPFOLDER}/power.ac.conserve ]; then SENDNOTICE "HOSTS POWER" "Power restored! Will wait ${PW_WAIT_TO_POWER_SERVERS}'mins before turning host(s) back on" touch ${PW_TMPFOLDER}/.power.restored fi @@ -480,7 +480,7 @@ Shutting down main servers" 1 # VOLTAGE: ${OFFSITE_VOLTIN}'volts" # rm -f ${PW_TMPFOLDER}/power.offsite.ac.* # fi -# if [ -f ${PW_TMPFOLDER}/power.offsite.off ]; then +# if [ -f ${PW_TMPFOLDER}/shutdown.OFFSITE ]; then # if [ ! -f ${PW_TMPFOLDER}/power.offsite.restored ]; then # touch ${PW_TMPFOLDER}/power.offsite.restored # @@ -506,10 +506,10 @@ Shutting down main servers" 1 # touch ${PW_TMPFOLDER}/power.offsite.ac.low # fi # -# if (( $(bc <<<"${OFFSITE_BATT_CAP} <= 95") )) && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then +# if (( $(bc <<<"${OFFSITE_BATT_CAP} <= 95") )) && [ ! -f ${PW_TMPFOLDER}/shutdown.OFFSITE ]; then # SENDNOTICE "OFFSITE HOST POWER" "Powering DOWN offsite host(s) due to power outage" 1 # SHUTDOWN_OFFSITE & -# touch ${PW_TMPFOLDER}/power.offsite.off +# touch ${PW_TMPFOLDER}/shutdown.OFFSITE # fi # fi # diff --git a/offsite-power-check.sh b/offsite-power-check.sh index 2ae44758..b2934779 100755 --- a/offsite-power-check.sh +++ b/offsite-power-check.sh @@ -67,14 +67,14 @@ $(date)" touch ${PW_TMPFOLDER}/power.offsite.charging fi if [ -f ${PW_TMPFOLDER}/power.offsite.ac.low ]; then - if [ -f ${PW_TMPFOLDER}/power.offsite.off ]; then + if [ -f ${PW_TMPFOLDER}/shutdown.OFFSITE ]; then echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Offsite Power Restored" >> ${PW_LOGFILE} SENDNOTICE "OFFSITE POWER" "Power restored! Will wait ${PW_OFFSITE_WAIT_TO_POWER_SERVERS}'mins before turning host(s) back on" fi rm -f ${PW_TMPFOLDER}/power.offsite.ac.* fi - if [ -f ${PW_TMPFOLDER}/power.offsite.off ]; then + if [ -f ${PW_TMPFOLDER}/shutdown.OFFSITE ]; then if [ ! -f ${PW_TMPFOLDER}/power.offsite.restored ]; then touch ${PW_TMPFOLDER}/power.offsite.restored @@ -107,10 +107,10 @@ $(date)" touch ${PW_TMPFOLDER}/power.offsite.ac.low.notice fi - if ([ ${OFFSITE_BATT_CAP%.*} -le ${PW_OFFSITE_SHUTDOWNSERVERS_AT_LOAD} ] || [ $(expr `date +%s` - $(stat -f %m ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge $(echo "scale=2; ${PW_OFFSITE_SHUTDOWNSERVERS_AFTER}*60" | bc) ]) && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then + if ([ ${OFFSITE_BATT_CAP%.*} -le ${PW_OFFSITE_SHUTDOWNSERVERS_AT_LOAD} ] || [ $(expr `date +%s` - $(stat -f %m ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge $(echo "scale=2; ${PW_OFFSITE_SHUTDOWNSERVERS_AFTER}*60" | bc) ]) && [ ! -f ${PW_TMPFOLDER}/shutdown.OFFSITE ]; then echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Powering Down Hosts!" >> ${PW_LOGFILE} SENDNOTICE "OFFSITE HOST POWER" "Powering DOWN offsite host(s) due to power outage" 1 - touch ${PW_TMPFOLDER}/power.offsite.off + touch ${PW_TMPFOLDER}/shutdown.OFFSITE for host in ${PW_OFFSITEHOSTS}; do if [ "${TEST}" = "" ] || [ "${TEST}" = "full" ]; then run=$(ssh root@${PW_VCENTERHOST} "sed -i '//{n;s/.*<\/enabled>/False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)