From 8caaa6e8297578886ee96ce32c817a6a76e85367 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 12 Dec 2023 23:53:48 -0600
Subject: [PATCH] update

---
 defaults.inc     |  2 +-
 powerwall.sh     | 32 ++++++++++++++++++++------------
 shutdown-test.sh |  2 ++
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 78bfce71..8e0cb917 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 
-VERS='2.5.12-12122023'
+VERS='2.5.13-12122023'
 
 noheader=' update service dailytemp confsync '
 HC_CW=60
diff --git a/powerwall.sh b/powerwall.sh
index 85a0b469..99496f51 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1210,13 +1210,15 @@ CHECK_SERVICES(){
 
 SHUTDOWN_MAIN(){
 	if [ "${1}" == "ServerRoomTH" ] || [ "${1}" == "TEMP" ]; then
-		SHUTDOWN_SERVERS MAIN ${1}
+		# SHUTDOWN_SERVERS MAIN ${1}
+		SHUTDOWN_SERVER2 main
 		# HOSTMGMT main -e off >/dev/null 2>&1
 		reason='Server Room Overheated!'
 		sendnotice=true
 		
 	elif [ "${1}" == "POWER" ]; then
-		SHUTDOWN_SERVERS MAIN ${1}
+		# SHUTDOWN_SERVERS MAIN ${1}
+		SHUTDOWN_SERVER2 main
 		# HOSTMGMT main -e off >/dev/null 2>&1
 		reason='Low Power!'
 		sendnotice=true
@@ -1235,13 +1237,15 @@ ${reason}" 1
 }
 SHUTDOWN_SYS(){
 	if [ "${1}" == "ServerRoomTH" ] || [ "${1}" == "TEMP" ]; then
-		SHUTDOWN_SERVERS SYS ${1}
+		# SHUTDOWN_SERVERS SYS ${1}
+		[ ! -f ${PW_TMPFOLDER}/shutdown.MAIN ] && SHUTDOWN_SERVER2 mainsite || SHUTDOWN_SERVER2 sys
 		# HOSTMGMT sys -e off >/dev/null 2>&1
 		reason='Server Room Overheated!'
 		sendnotice=true
 		
 	elif [ "${1}" == "POWER" ]; then
-		SHUTDOWN_SERVERS SYS ${1}
+		# SHUTDOWN_SERVERS SYS ${1}
+		[ ! -f ${PW_TMPFOLDER}/shutdown.MAIN ] && SHUTDOWN_SERVER2 mainsite || SHUTDOWN_SERVER2 sys
 		# HOSTMGMT sys -e off >/dev/null 2>&1
 		reason='Low Power!'
 		sendnotice=true
@@ -1776,10 +1780,10 @@ MAINT_MODE_VERIFY_SHUTDOWN(){
 	ssh root@${ESXIHOST} 'esxcli system shutdown poweroff -d 10 -r "Power-Monitor script initiated system shutdown"'
 	ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e false -t 0'
 	
-	if [ "${ESXIHOST}" == "10.10.2.10" ]; then
-		while ping -qw 10 -c3 "${ESXIHOST}">/dev/null 2>&1; do sleep 1; done
-		 "$(CHECK_HOST ${ESXIHOST})" == "false" ] && snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 2
-	fi
+	# if [ "${ESXIHOST}" == "10.10.2.10" ]; then
+	# 	while ping -qw 10 -c3 "${ESXIHOST}">/dev/null 2>&1; do sleep 1; done
+	# 	 "$(CHECK_HOST ${ESXIHOST})" == "false" ] && snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 2
+	# fi
 }
 SHUTDOWN_SERVER(){
 	if [ "${PW_iDRACHOST_SHORTNAMES[${1}]}" != "" ]; then
@@ -2001,19 +2005,23 @@ HOSTMGMT(){
 		if [ "${HOST^^}" == "ALL" ] || [ "${HOST^^}" == "MAINSITE" ] || [ "${HOST^^}" == "OFFSITE" ] || [ "${HOST^^}" == "MAIN" ] || [ "${HOST^^}" == "SYS" ]; then
 			if [ "${ESXI}" == "maint" ] || [ "${ESXI}" == "maintenance" ] || [ "${ESXI}" == "mm" ]; then
 				echo -e "${idsCL[LightGreen]}PUTTING '${ESXI_HOST}' HOSTS INTO MAINTENANCE MODE${idsCL[Default]}\n"
-				SHUTDOWN_SERVERS ${ESXI_HOST,,} maintenance
+				# SHUTDOWN_SERVERS ${ESXI_HOST,,} maintenance
+				SHUTDOWN_SERVERS2 ${ESXI_HOST,,} maintenance
 			else
 				echo -e "${idsCL[LightGreen]}SHUTTING DOWN '${ESXI_HOST}' HOSTS${idsCL[Default]}\n"
-				SHUTDOWN_SERVERS ${ESXI_HOST,,}
+				# SHUTDOWN_SERVERS ${ESXI_HOST,,}
+				SHUTDOWN_SERVERS2 ${ESXI_HOST,,}
 			fi
 
 		else
 			if [ "${ESXI}" == "maint" ] || [ "${ESXI}" == "maintenance" ] || [ "${ESXI}" == "mm" ]; then
 				echo -e "${idsCL[LightGreen]}PUTTING HOST INTO MAINTENANCE MODE${idsCL[Default]}\n"
-				SHUTDOWN_SERVER ${HOST} maintenance
+				# SHUTDOWN_SERVER ${HOST} maintenance
+				SHUTDOWN_SERVER2 ${HOST} maintenance
 			else
 				echo -e "${idsCL[LightGreen]}SHUTTING DOWN HOST${idsCL[Default]}\n"
-				SHUTDOWN_SERVER ${HOST}
+				# SHUTDOWN_SERVER ${HOST}
+				SHUTDOWN_SERVER2 ${HOST}
 			fi
 			
 		fi
diff --git a/shutdown-test.sh b/shutdown-test.sh
index d8e74274..2c914ac6 100644
--- a/shutdown-test.sh
+++ b/shutdown-test.sh
@@ -252,8 +252,10 @@ SHUTDOWN_SERVER2(){
 
 			fi
 			[ "${ESXI_HOST}" != "10.10.2.10" ] && echo -e "\n${idsCL[LightCyan]}${hostname}${idsCL[White]} will be shutdown momentarily ... \n"
+			touch ${PW_TMPFOLDER}/shutdown.${ESXI_HOST}
 		else
 			echo -e "\n${idsCL[LightCyan]}${hostname}${idsCL[White]} will be in maintenance mode momentarily ... \n"
+			touch ${PW_TMPFOLDER}/maintmode.${ESXI_HOST}
 		fi
 		
 	else