From 0fe2a46cd0dc3cb21eee699b7f2394d9a1662efb Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 10 Nov 2024 13:19:50 -0600
Subject: [PATCH] update

---
 defaults.inc           |  2 +-
 inc/power.inc.bak.sh   |  4 ++--
 inc/power.inc.sh       | 10 ++++------
 offsite-power-check.sh |  4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 7ac6414a..22f38420 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.7.126-11102024'
+VERS='2.8.1-11102024'
 
 noheader=' update service dailytemp confsync -r -report test '
 
diff --git a/inc/power.inc.bak.sh b/inc/power.inc.bak.sh
index ea509019..4d1221d4 100644
--- a/inc/power.inc.bak.sh
+++ b/inc/power.inc.bak.sh
@@ -642,7 +642,7 @@ OFFSITE_CHECKPOWER_SERVICE(){
 		# TEST=true
 		# TEST=full
 		if [ "${TEST}" != "" ]; then
-			PW_OFFSITE_SHUTDOWNSERVERS_AT_LOAD=95		#percent
+			PW_OFFSITE_SHUTDOWNSERVERS_AT_BATTCAP=98		#percent
 			PW_OFFSITE_SHUTDOWNSERVERS_AFTER=1			#minutes
 			PW_OFFSITE_WAIT_TO_POWER_SERVERS=1			#minutes
 			TESTMODE="### TEST MODE ACTIVE ###
@@ -743,7 +743,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F"
 					touch ${PW_TMPFOLDER}/power.offsite.ac.low.notice
 				fi
 
-				if [ ! -f ${PW_TMPFOLDER}/shutdown.OFFSITE ] && [ ${OFFSITE_WATTS%.*} -gt 100 ] && ([ ${OFFSITE_BATT_CAP%.*} -le ${PW_OFFSITE_SHUTDOWNSERVERS_AT_LOAD} ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge $(echo "scale=2; ${PW_OFFSITE_SHUTDOWNSERVERS_AFTER}*60" | bc) ]); then
+				if [ ! -f ${PW_TMPFOLDER}/shutdown.OFFSITE ] && [ ${OFFSITE_WATTS%.*} -gt 100 ] && ([ ${OFFSITE_BATT_CAP%.*} -le ${PW_OFFSITE_SHUTDOWNSERVERS_AT_BATTCAP} ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge $(echo "scale=2; ${PW_OFFSITE_SHUTDOWNSERVERS_AFTER}*60" | bc) ]); then
 					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Powering Down Hosts!" >> ${PW_LOGFILE}
 					SENDNOTICE2 "OFFSITE HOST POWER" "Powering DOWN offsite host(s) due to power outage" 1
 					touch ${PW_TMPFOLDER}/shutdown.OFFSITE
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index d613767b..37678aab 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -858,7 +858,7 @@ OFFSITE_CHECKPOWER_SERVICE(){
 		[ "${TEST_OFFSITE}" != "" ] && TEST=${TEST_OFFSITE} || TEST=''
 		
 		if [ "${TEST}" != "" ]; then
-			PW_OFFSITE_SHUTDOWNSERVERS_AT_LOAD=95		#percent
+			PW_OFFSITE_SHUTDOWNSERVERS_AT_BATTCAP=98		#percent
 			PW_OFFSITE_SHUTDOWNSERVERS_AFTER=1			#minutes
 			PW_OFFSITE_WAIT_TO_POWER_SERVERS=1			#minutes
 			TESTMODE="### TEST MODE ACTIVE ###
@@ -930,6 +930,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F"
 				fi
 				if [ -f ${PW_TMPFOLDER}/power.offsite.ac.low ]; then
 					if [ -f ${PW_TMPFOLDER}/shutdown.OFFSITE ]; then
+						touch ${PW_TMPFOLDER}/power.offsite.restored
 						echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Offsite Power Restored" >> ${PW_LOGFILE}
 						SENDNOTICE2 "OFFSITE POWER" "Power restored! Will wait ${PW_OFFSITE_WAIT_TO_POWER_SERVERS}'mins before turning host(s) back on"
 					fi
@@ -937,10 +938,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F"
 					rm -f ${PW_TMPFOLDER}/power.offsite.ac.*
 				fi
 				if [ -f ${PW_TMPFOLDER}/shutdown.OFFSITE ]; then
-					if [ ! -f ${PW_TMPFOLDER}/power.offsite.restored ]; then
-						touch ${PW_TMPFOLDER}/power.offsite.restored
-
-					elif [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.restored)) -gt $(echo "scale=2; ${PW_OFFSITE_WAIT_TO_POWER_SERVERS}*60" | bc) ]; then
+					if [ -f ${PW_TMPFOLDER}/power.offsite.restored ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.restored)) -gt $(echo "scale=2; ${PW_OFFSITE_WAIT_TO_POWER_SERVERS}*60" | bc) ]; then
 						echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Powering Hosts ON After Power Outage" >> ${PW_LOGFILE}
 						SENDNOTICE2 "OFFSITE HOST POWER" "Powering offsite host(s) back ONLINE after power outage"
 						for host in ${PW_OFFSITEHOSTS_IDRAC}; do
@@ -967,7 +965,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F"
 					touch ${PW_TMPFOLDER}/power.offsite.ac.low.notice
 				fi
 
-				if [ ! -f ${PW_TMPFOLDER}/shutdown.OFFSITE ] && [ ${OFFSITE_WATTS%.*} -gt 100 ] && ([ ${OFFSITE_BATT_CAP%.*} -le ${PW_OFFSITE_SHUTDOWNSERVERS_AT_LOAD} ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge $(echo "scale=2; ${PW_OFFSITE_SHUTDOWNSERVERS_AFTER}*60" | bc) ]); then
+				if [ ! -f ${PW_TMPFOLDER}/shutdown.OFFSITE ] && [ ${OFFSITE_WATTS%.*} -gt 100 ] && ([ ${OFFSITE_BATT_CAP%.*} -le ${PW_OFFSITE_SHUTDOWNSERVERS_AT_BATTCAP} ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge $(echo "scale=2; ${PW_OFFSITE_SHUTDOWNSERVERS_AFTER}*60" | bc) ]); then
 					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Powering Down Hosts!" >> ${PW_LOGFILE}
 					SENDNOTICE2 "OFFSITE HOST POWER" "Powering DOWN offsite host(s) due to power outage" 1
 					touch ${PW_TMPFOLDER}/shutdown.OFFSITE
diff --git a/offsite-power-check.sh b/offsite-power-check.sh
index 28af8e93..2b73d225 100755
--- a/offsite-power-check.sh
+++ b/offsite-power-check.sh
@@ -21,7 +21,7 @@ PWO_START(){
 		# TEST=true
 		# TEST=full
 		if [ "${TEST}" != "" ]; then
-			PW_OFFSITE_SHUTDOWNSERVERS_AT_LOAD=95		#percent
+			PW_OFFSITE_SHUTDOWNSERVERS_AT_BATTCAP=98		#percent
 			PW_OFFSITE_SHUTDOWNSERVERS_AFTER=1			#minutes
 			PW_OFFSITE_WAIT_TO_POWER_SERVERS=1			#minutes
 			TESTMODE="### TEST MODE ACTIVE ###
@@ -113,7 +113,7 @@ $(date)"
 					touch ${PW_TMPFOLDER}/power.offsite.ac.low.notice
 				fi
 
-				if [ ! -f ${PW_TMPFOLDER}/shutdown.OFFSITE ] && [ ${OFFSITE_WATTS%.*} -gt 100 ] && ([ ${OFFSITE_BATT_CAP%.*} -le ${PW_OFFSITE_SHUTDOWNSERVERS_AT_LOAD} ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge $(echo "scale=2; ${PW_OFFSITE_SHUTDOWNSERVERS_AFTER}*60" | bc) ]); then
+				if [ ! -f ${PW_TMPFOLDER}/shutdown.OFFSITE ] && [ ${OFFSITE_WATTS%.*} -gt 100 ] && ([ ${OFFSITE_BATT_CAP%.*} -le ${PW_OFFSITE_SHUTDOWNSERVERS_AT_BATTCAP} ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge $(echo "scale=2; ${PW_OFFSITE_SHUTDOWNSERVERS_AFTER}*60" | bc) ]); 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}/shutdown.OFFSITE