Update temp.inc.sh

defaults.inc

@@ -1,15 +1,29 @@
+#!/usr/bin/env bash
 
-VERS='2.5.106-01052024'
+PW_VERS='2.12.21-09262025'
 
-noheader=' update service dailytemp confsync -r -report '
+noheader=' update service dailytemp confsync -r -report test '
 
 HC_CW=60
+PRI_WIDTH=75
+ESXI_DEFAULT_EXHAUST_MIN=85
+IP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
+
+NM_FOLDER='/opt/idssys/nodemgmt'
+NM_TMPFOLDER=${NM_FOLDER}/.tmp
+[ -f ${NM_FOLDER}/conf/defaults.local.inc ] && source ${NM_FOLDER}/defaults.inc
+
+[ "${TESTMODE_ENABLE^^}" == "TRUE" ] && TESTMODE=1 || TESTMODE=0
 
 PW_FOLDER='/opt/idssys/powerwall'
 PW_INCFOLDER=${PW_FOLDER}/inc
-PW_LOGFOLDER=${PW_FOLDER}/logs
-PW_LOGARCHIVE=${PW_FOLDER}/logs/archive
+[[ "${IP}" = "10.2.1."* ]] && PW_LOGFOLDER=${PW_FOLDER}/logs/offsite || PW_LOGFOLDER=${PW_FOLDER}/logs/mainsite
+PW_LOGARCHIVE=${PW_LOGFOLDER}/archive
 PW_TMPFOLDER=${PW_FOLDER}/.tmp
+
+
+([ -f ${PW_TMPFOLDER}/.nosend_update ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.nosend_update)) -ge 45 ]) && rm -f ${PW_TMPFOLDER}/.nosend_update
+
 [ ! -d ${PW_INCFOLDER} ] && mkdir ${PW_INCFOLDER}
 [ ! -d ${PW_LOGFOLDER} ] && mkdir ${PW_LOGFOLDER}
 [ ! -d ${PW_LOGARCHIVE} ] && mkdir ${PW_LOGARCHIVE}
@@ -23,15 +37,23 @@ PW_LOGPOWER=${PW_LOGFOLDER}/log-power
 
 M_SRVCOPT=(start stop restart reload enable disable)
 
-source ${PW_FOLDER}/settings.conf
+source ${PW_FOLDER}/conf/settings.conf
+
+if [ "${PW_MYSQL_HOST}" != "" ]; then
+	if [[ "${IP}" == "10.6.1"* ]]; then
+		mysql_conn="/usr/bin/mariadb --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}"
+	else
+		mysql_conn="/usr/bin/mariadb -P 3308 -h ${PW_MYSQL_HOST} --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}"
+	fi
+fi
+[ "${PW_MQTT_HOST}" != "" ] && mqtt_conn="/usr/bin/mosquitto_sub -h ${PW_MQTT_HOST} -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}"
+	
 EMAIL_NOTICE=${PW_EMAIL_NOTICE}
 PUSHOVER_APP_TOKEN=${PW_PUSHOVER_APP_TOKEN}
 PUSHOVER_USER_TOKEN=${PW_PUSHOVER_USER_TOKEN}
 
-
-mqtt_conn="/usr/bin/mosquitto_sub -h 127.0.0.1 -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}"
-# mysql_conn="/usr/bin/mysql -h ${PW_MYSQL_HOST} -P 6033 --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}"
-mysql_conn='/usr/bin/mysql'
+[ "${PW_ENABLE_RENOTIFY}" == "" ] && PW_ENABLE_RENOTIFY=1
+PW_FANINPUT='/sys/class/hwmon/*/fan1_input'
 
 IFS=,
 PW_MAINSITEHOSTS=(${PW_MAINSITE_HOSTS})
@@ -40,9 +62,16 @@ PW_MAINHOSTS=(${PW_MAIN_HOSTS})
 PW_SYSHOSTS=(${PW_SYS_HOSTS})
 PW_OFFSITEHOSTS=(${PW_OFFSITE_HOSTS})
 PW_ALLHOSTS=(${PW_ALL_HOSTS})
+PW_CONSERVEHOSTS=(${PW_CONSERVE_HOSTS})
+PW_ESXI_FANSPEEDCONTROLHOSTS=(${PW_ESXI_FANSPEEDCONTROL_HOSTS})
+[ "${PW_TEMPIND_RANGE}" != "" ] && PW_TEMPIND_RANGE=(${PW_TEMPIND_RANGE})
 unset IFS
 
-if [ -f ${PW_FOLDER}/settings.local.conf ]; then
+[ "${PW_ISCSI_PRI_HOST}" = "" ] && PW_ISCSI_PRI_HOST="10.10.2.10"
+[ "${PW_ISCSI_SYS_HOST}" = "" ] && PW_ISCSI_SYS_HOST="10.10.2.16"
+
+
+if [ -f ${PW_FOLDER}/conf/settings.local.conf ]; then
 	declare -A PW_POWERWALL_SERVICES
 	declare -A PW_THRESHOLDS
 	declare -A PW_SENSOR_TYPE
@@ -58,9 +87,15 @@ if [ -f ${PW_FOLDER}/settings.local.conf ]; then
 	declare -A PW_INVERTER_STATES
 	declare -A PW_INVERTER_MODES
 	declare -A PW_INVERTER_ERRORS
-	declare -A PW_LACROSSE_ID
+	declare -A PW_UPS_STATES
+	declare -A PW_SENSOR_DEVICEID
+	declare -A PW_OFFSITE_UPS_CODES
+	declare -A PW_MISCSENSOR_DESC
+	declare -A PW_DESC_TEMP
 	
-	source ${PW_FOLDER}/settings.local.conf
+	source ${PW_FOLDER}/conf/settings.local.conf
+	
+	[ "${PW_TEMPIND_DIFF}" == "" ] && PW_TEMPIND_DIFF=1
 	
 else
 	echo "NO settings.local.conf FILE FOUND"
@@ -74,20 +109,21 @@ SENDNOTICE(){
 	if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then
 		SN_TIT="$(echo -e "${1}" | sed "s/\%/\%25 /g")"
 		SN_MSG="$(echo -e "${2}" | sed "s/\%/\%25 /g")"
-		if [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ]; then
+		if [ ${TESTMODE} -eq 1 ]; then
 			PUSH_TO_MOBILE "***TEST MODE***
 
 ${SN_MSG}
 
-$(date)" "${SN_TIT}" ${3} &
+$(date)
+${NM_HOSTNAMES[${IP}]}" "${SN_TIT}" ${3} ${4} &
 		else
-			# echo "HERE: [${SN_TIT}]=${SN_MSG}: DONE"
 			PUSH_TO_MOBILE "${SN_MSG}
 
-$(date)" "${SN_TIT}" ${3} &
+[${NM_HOSTNAMES[${IP}]}] $(date)" "${SN_TIT}" ${3} ${4} &
 		fi
 	fi
-	[ "${PW_EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date +%Y-%m-%d-%H-%M-%S)" | mail -s "${1}" ${PW_EMAIL_NOTICE}
+	[ "${PW_EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date +%Y-%m-%d-%H-%M-%S)\n${NM_HOSTNAMES[${IP}]}" | mail -s "${1}" ${PW_EMAIL_NOTICE}
 	
 }
 
+

esxi-scripts/cls-shutdown.ps1

@@ -1,9 +1,9 @@
 #!/usr/bin/env pwsh
 
-. /opt/idssys/powerwall/settings.ps1
+. /opt/idssys/powerwall/conf/settings.ps1
 
 Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
 
 Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -like '*CLS*'} | Shutdown-VMGuest -Confirm:$false
 
-exit 0
+Disconnect-VIServer -Server $args[0] -Force –Confirm:$false

esxi-scripts/cooldown.overnight.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
+
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
+
+Get-VM | Where {$_.Name -like '*OMSA*' -or $_.Name -like '*MySQL-Manager*' -or $_.Name -like '*Webserver-Node1*' -or $_.Name -like '*MySQL-Node1*' -or $_.Name -like '*LB-Node1*'} | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*Offsite-Backups*' -and $_.Name -notlike '*_replica'} | Shutdown-VMGuest -Confirm:$false
+
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

esxi-scripts/cooldown.ps1

@@ -0,0 +1,39 @@
+#!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
+
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
+
+Get-VM | Where {
+	$_.Name -like '*MySQL-Node2*' `
+	-or $_.Name -like '*Webserver-Node2*' `
+	-or $_.Name -like '*LB-Node2*' `
+	-or $_.Name -like '*UniFi-Camera-Proxy*' `
+	-or $_.Name -like '*Internet Monitor*' `
+	-or $_.Name -like '*OMSA*' `
+	-or $_.Name -like '*RustDesk Server*' `
+	-or $_.Name -like '*Fileserver*' `
+	-or $_.Name -like '*UrBackup*' `
+	-or $_.Name -like '*MySQL-Manager*' `
+} | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*Offsite-Backups*'} | Shutdown-VMGuest -Confirm:$false
+
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

esxi-scripts/coolup.overnight.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
+
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
+
+Get-VM | Where {$_.Name -like '*OMSA*' -or $_.Name -like '*MySQL-Manager*' -or $_.Name -like '*Webserver-Node1*' -or $_.Name -like '*MySQL-Node1*' -or $_.Name -like '*LB-Node1*'} | Where {$_.PowerState -notlike '*On*' -and $_.Name -notlike '*Offsite-Backups*' -and $_.Name -notlike '*_replica'} | Start-VM -Confirm:$false
+
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

esxi-scripts/disable-system-vms.ps1

@@ -0,0 +1,11 @@
+#!/usr/bin/env pwsh
+
+### NOT WORKING ###
+
+. /opt/idssys/powerwall/conf/settings.ps1
+
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
+
+Set-DrsRule -Rule 'System VMs (S)' -Enabled $false;
+
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/esxi-shutdown2.sh

@@ -1,7 +1,8 @@
 #/bin/sh
 
 echo "Putting the Host into maintenance mode ..."
-vim-cmd hostsvc/maintenance_mode_enter
+#vim-cmd hostsvc/maintenance_mode_enter
+esxcli system maintenanceMode set -e true -t 0 &
 
 VMS=`vim-cmd vmsvc/getallvms | grep -v Vmid | awk '{print $1}'`
 for VM in $VMS; do

esxi-scripts/get-snapshots.ps1

@@ -1,11 +1,17 @@
 #!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
+Write-Progress -Activity "Connecting to vCenter [$VCENTERHOST] ..." -PercentComplete 20
 
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
 
-get-vm | get-snapshot | where {($_.vm -notlike '*_replica')} | select vm, name, description, created, sizegb
+Write-Progress -Activity "Connected! Gathering all VM Snapshots ..." -PercentComplete 80
+
+$snapshots = get-vm | get-snapshot | where {($_.vm -notlike '*_replica')} | select vm, name, description, created, sizegb
 # get-vm | get-snapshot | where {($_.vm -notlike '*_replica')} | select vm, name, description, created, sizegb | ConvertTo-Json -Depth 1 -WarningAction:SilentlyContinue
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Write-Progress -Activity "Done" -Completed
+
+$snapshots | Format-List
+
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/host-maintenance_mode.ps1

@@ -1,10 +1,9 @@
 #!/usr/bin/env pwsh
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
+. /opt/idssys/powerwall/conf/settings.ps1
 
-$ESXI = Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
 
 Get-VMHost -Name $args[0] | set-vmhost -State Maintenance -Evacuate
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/host-vm-shutdown-verify.ps1

@@ -0,0 +1,27 @@
+#!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
+
+Connect-VIServer -Force -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+
+Do {
+	$VMLIST = Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*' -and $_.Name -notlike '*iSCSI*'}
+	if ($VMLIST -ne $null) {
+		$poff = 'no'
+		Foreach ($VM in $VMLIST) {
+			$VMI = Get-VM $VM
+			if ($VMI -eq $null -Or $VMI.PowerState -match 'PoweredOn') {
+				$poff = 'no'
+				break
+			} else {
+		        $poff = 'yes'
+		    }
+		}
+		Start-Sleep -s 1
+	} else {
+		$poff = 'yes'
+	}
+} Until ($poff -match 'yes')
+
+
+Disconnect-VIServer -Server $args[0] -Force –Confirm:$false
+

esxi-scripts/host-vm-shutdown.ps1

@@ -0,0 +1,15 @@
+#!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
+	
+Connect-VIServer -Force -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+
+$vms=Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*' -and $_.Name -notlike '*iSCSI*'}
+Foreach ($vm in $vms)
+{
+	$migrating=Get-Task | ?{$_.ObjectId -match 'VirtualMachine'} | Select @{N='VM';E={(Get-View -Id $_.ObjectId).Name }},State,Description | where  {$_.VM -eq $vm -and $_.Description -like '*Migrate*' -and $_.State -eq 'Running'}
+	if ([string]::IsNullOrEmpty($migrating)) {
+		Get-VM $vm | Shutdown-VMGuest -Confirm:$false
+	}
+}
+
+Disconnect-VIServer -Server $args[0] -Force –Confirm:$false

esxi-scripts/iscsi-all-shutdown-verify.ps1

@@ -1,30 +1,28 @@
 #!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
-
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
 
 Do {
-	$VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-*'} | Get-VM
-	write-host $VMLIST
+	$VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-*' -and $_.Name -notlike '*vMS*'} | Get-VM
 	if ($VMLIST -ne $null) {
-		write-host "cycling through iscsi vms found"
 		$poff = 'no'
 		Foreach ($VM in $VMLIST) {
 			$VMI = Get-VM $VM
-			if ($VMI -eq $null -Or $VMI.PowerState -match 'PoweredOn') {
-				$poff = 'no'
-				break
-			} else {
-		        $poff = 'yes'
-		    }
+			if ($VMI.Name -notlike '*CLS*' -and $VMI.Name -notlike '*iSCSI-*') {
+				if ($VMI -eq $null -Or $VMI.PowerState -match 'PoweredOn') {
+					$poff = 'no'
+					break
+				} else {
+			        $poff = 'yes'
+			    }
+			}
 		}
+		Start-Sleep -s 1
 	} else {
-		write-host "no iscsi vms found"
 		$poff = 'yes'
 	}
 } Until ($poff -match 'yes')
 
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/iscsi-all-vm-shutdown.ps1

@@ -1,10 +1,8 @@
 #!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
 
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+Get-Datastore | Where {$_.Name -like '*iSCSI-*' -and $_.Name -notlike '*vMS*'} | Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*' -and $_.Name -notlike '*iSCSI-*'} | Shutdown-VMGuest -Confirm:$false
 
-Get-Datastore | Where {$_.Name -like '*iSCSI-*'} | Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*'} | Shutdown-VMGuest -Confirm:$false
-
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/iscsi-server-shutdown.ps1

@@ -1,10 +1,10 @@
 #!/usr/bin/env pwsh
 
 Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
+. /opt/idssys/powerwall/conf/settings.ps1
 
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
 
 Get-VM | Where {$_.Name -like '*iSCSI-*'} | Shutdown-VMGuest -Confirm:$false
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $args[0] -Force –Confirm:$false

esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1

@@ -1,15 +1,11 @@
 #!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
-
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
 
 Do {
 	$VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-SYS*'} | Get-VM
-	write-host $VMLIST
 	if ($VMLIST -ne $null) {
-		write-host "cycling through iscsi vms found"
 		$poff = 'no'
 		Foreach ($VM in $VMLIST) {
 			$VMI = Get-VM $VM
@@ -20,11 +16,11 @@ Do {
 		        $poff = 'yes'
 		    }
 		}
+		Start-Sleep -s 1
 	} else {
-		write-host "no iscsi vms found"
 		$poff = 'yes'
 	}
 } Until ($poff -match 'yes')
 
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/iscsi-sys-vm-shutdown.ps1

@@ -1,10 +1,8 @@
 #!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
-
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
 
 Get-Datastore | Where {$_.Name -like '*iSCSI-SYS*'} | Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*'} | Shutdown-VMGuest -Confirm:$false
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/iscsi-vm-shutdown-verify.ps1

@@ -1,15 +1,11 @@
 #!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
-
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
 
 Do {
 	$VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-PRI*'} | Get-VM
-	write-host $VMLIST
 	if ($VMLIST -ne $null) {
-		write-host "cycling through iscsi vms found"
 		$poff = 'no'
 		Foreach ($VM in $VMLIST) {
 			$VMI = Get-VM $VM
@@ -20,11 +16,11 @@ Do {
 		        $poff = 'yes'
 		    }
 		}
+		Start-Sleep -s 1
 	} else {
-		write-host "no iscsi vms found"
 		$poff = 'yes'
 	}
 } Until ($poff -match 'yes')
 
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/iscsi-vm-shutdown.ps1

@@ -1,10 +1,8 @@
 #!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
-
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
 
 Get-Datastore | Where {$_.Name -like '*iSCSI-PRI*'} | Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*'} | Shutdown-VMGuest -Confirm:$false
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/offsite-host-shutdown.ps1

@@ -0,0 +1,38 @@
+#!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
+	
+Connect-VIServer -Force -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+
+Get-VM | Where {$_.PowerState -like '*On*'} | Shutdown-VMGuest -Confirm:$false
+
+# $vms=Get-VM | Where {$_.PowerState -like '*On*'}
+# Foreach ($vm in $vms)
+# {
+# 	$migrating=Get-Task | ?{$_.ObjectId -match 'VirtualMachine'} | Select @{N='VM';E={(Get-View -Id $_.ObjectId).Name }},State,Description | where  {$_.VM -eq $vm -and $_.Description -like '*Migrate*' -and $_.State -eq 'Running'}
+# 	if ([string]::IsNullOrEmpty($migrating)) {
+# 		Get-VM $vm | Shutdown-VMGuest -Confirm:$false
+# 	}
+# }
+
+Do {
+	$VMLIST = Get-VM | Where {$_.PowerState -like '*On*'}
+	if ($VMLIST -ne $null) {
+		$poff = 'no'
+		Foreach ($VM in $VMLIST) {
+			$VMI = Get-VM $VM
+			if ($VMI -eq $null -Or $VMI.PowerState -match 'PoweredOn') {
+				$poff = 'no'
+				break
+			} else {
+		        $poff = 'yes'
+		    }
+		}
+		Start-Sleep -s 1
+	} else {
+		$poff = 'yes'
+	}
+} Until ($poff -match 'yes')
+
+Stop-VMHost $args[0] -Force -Confirm:$false
+
+Disconnect-VIServer -Server $args[0] -Force –Confirm:$false

esxi-scripts/set-drs.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
+
+Write-Progress -Activity "Connecting to vCenter [$VCENTERHOST] ..." -PercentComplete 20
+
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
+
+Write-Progress -Activity "Connected! Setting the new DRS Max vCPU ..." -PercentComplete 75
+
+$spec = New-Object VMware.Vim.ClusterConfigSpecEx
+$spec.DrsConfig = New-Object VMware.Vim.ClusterDrsConfigInfo
+
+$spec.DrsConfig.Option = New-Object VMware.Vim.OptionValue[] (1)
+$spec.DrsConfig.Option[0] = New-Object VMware.Vim.OptionValue
+$spec.DrsConfig.Option[0].Key = 'MaxVcpusPerCore'
+$spec.DrsConfig.Option[0].Value = $args[0]
+
+$cluster_ID= Get-Cluster -Name "iDS-Cluster"
+$_this = Get-View -Id $cluster_ID.Id
+$_this.ReconfigureComputeResource_Task($spec, $true)
+
+Write-Progress -Activity "Refreshing DRS and invoking any DRS Recommendations ..." -PercentComplete 90
+
+Get-Cluster -Name "iDS-Cluster" | Get-DrsRecommendation -Refresh | Invoke-DrsRecommendation
+
+Write-Progress -Activity "Done" -Completed
+
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false

esxi-scripts/sys-suspend.ps1

@@ -1,10 +1,10 @@
 #!/usr/bin/env pwsh
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
+# Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
+. /opt/idssys/powerwall/conf/settings.ps1
 
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
 
 Get-VM | Where {$_.PowerState -like '*On*' -and ($_.Name -like '*MySQL-Node*' -or $_.Name -like '*LAN-DNS*')} | Suspend-VM -Confirm:$false
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $args[0] -Force –Confirm:$false

esxi-scripts/vm-shutdown-verify.ps1

@@ -1,15 +1,13 @@
 #!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
+# Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
 
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword
+Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
 
 Do {
 	$VMLIST = Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*' -and $_.Name -notlike '*iSCSI*'}
-	write-host $VMLIST
 	if ($VMLIST -ne $null) {
-		write-host "cycling through iscsi vms found"
 		$poff = 'no'
 		Foreach ($VM in $VMLIST) {
 			$VMI = Get-VM $VM
@@ -20,11 +18,12 @@ Do {
 		        $poff = 'yes'
 		    }
 		}
+		Start-Sleep -s 1
 	} else {
-		write-host "no iscsi vms found"
 		$poff = 'yes'
 	}
 } Until ($poff -match 'yes')
 
 
-Disconnect-VIServer $ESXI -Confirm:$false
+Disconnect-VIServer -Server $args[0] -Force –Confirm:$false
+

esxi-scripts/vm-shutdown.ps1

@@ -1,10 +1,20 @@
 #!/usr/bin/env pwsh
+. /opt/idssys/powerwall/conf/settings.ps1
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null
-. /opt/idssys/powerwall/settings.ps1
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null
 
-$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+$vmhosts=$args[0].Split(",")
+Foreach ($vmhost in $vmhosts)
+{
+	$vms=Get-VMHost | Where {$_.Name -eq $vmhost} | Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*' -and $_.Name -notlike '*iSCSI*'}
+	Foreach ($vm in $vms)
+	{
+		$migrating=Get-Task | ?{$_.ObjectId -match 'VirtualMachine'} | Select @{N='VM';E={(Get-View -Id $_.ObjectId).Name }},State,Description | where  {$_.VM -eq $vm -and $_.Description -like '*Migrate*' -and $_.State -eq 'Running'}
+		if ([string]::IsNullOrEmpty($migrating)) {
+			Get-VM $vm | Shutdown-VMGuest -Confirm:$false
+		}
+	}
+}
 
-Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*' -and $_.Name -notlike '*iSCSI*'} | Shutdown-VMGuest -Confirm:$false
+Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false
 
-Disconnect-VIServer $ESXI -Confirm:$false

offsite-power-check.sh

@@ -1,221 +0,0 @@
-#!/usr/bin/env sh
-
-PW_FOLDER='/opt/idssys/powerwall'
-PW_LOGFOLDER=${PW_FOLDER}/logs
-PW_LOGARCHIVE=${PW_FOLDER}/logs/archive
-PW_TMPFOLDER=${PW_FOLDER}/.tmp
-[ ! -d ${PW_LOGFOLDER} ] && mkdir ${PW_LOGFOLDER}
-[ ! -d ${PW_LOGARCHIVE} ] && mkdir ${PW_LOGARCHIVE}
-[ ! -d ${PW_TMPFOLDER} ] && mkdir ${PW_TMPFOLDER}
-PW_LOGFILE=${PW_LOGFOLDER}/logfile
-PW_LOGPOWER=${PW_LOGFOLDER}/log-power
-[ ! -f ${PW_LOGFILE} ] && touch ${PW_LOGFILE}
-[ ! -f ${PW_LOGPOWER} ] && touch ${PW_LOGPOWER}
-
-PWO_START(){
-	startup=true
-	while true; do
-		
-		. /opt/idssys/powerwall/settings.conf
-		PW_OFFSITEHOSTS=$(echo ${PW_OFFSITE_HOSTS} | tr ',' ' ')
-		# TEST=true
-		# TEST=full
-		if [ "${TEST}" != "" ]; then
-			PW_OFFSITE_SHUTDOWNSERVERS_AT_LOAD=95		#percent
-			PW_OFFSITE_SHUTDOWNSERVERS_AFTER=1			#minutes
-			PW_OFFSITE_WAIT_TO_POWER_SERVERS=1			#minutes
-			TESTMODE="### TEST MODE ACTIVE ###
-
-		"
-		else
-			TESTMODE=""
-		fi
-		
-		upsinfo=$(upsc CP1500PFCLCD)
-		if [ "$(echo "${upsinfo}" | grep 'input.voltage:' | sed 's/.*: //')" != "" ]; then
-			rm -f ${PW_TMPFOLDER}/power.ups.losscomm
-			OFFSITE_VOLTIN=$(echo "${upsinfo}" | grep 'input.voltage:' | sed 's/.*: //')
-			OFFSITE_LOAD=$(echo "${upsinfo}" | grep 'ups.load:' | sed 's/.*: //')
-			OFFSITE_LOAD=`echo "scale=2; ${OFFSITE_LOAD}/100" | bc`
-			OFFSITE_WATTS=`echo "scale=2; ${OFFSITE_LOAD}*$(echo "${upsinfo}" | grep 'ups.realpower.nominal:' | sed 's/.*: //')" | bc`
-			OFFSITE_BATT_RUNTIME=$(echo "${upsinfo}" | grep 'battery.runtime:' | sed 's/.*: //')
-			OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | bc`
-			OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //')
-			SENDNOTICE(){
-				MESSAGE="${TESTMODE}${2}
-
-BATTERY CHARGE: ${OFFSITE_BATT_CAP}'%
-BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'mins
-AC VOLTAGE: ${OFFSITE_VOLTIN}'volts
-WATT USAGE: ${OFFSITE_WATTS}'watts
-
-$(date)"
-				if [ "${3}" = "1" ]; then PRIORITY="${3}"; MSGSOUND=siren; elif [ "${3}" != "" ]; then PRIORITY=${3}; else PRIORITY=0; fi
-				curl -m 3 -sd "token=${PW_PUSHOVER_APP_TOKEN}&user=${PW_PUSHOVER_USER_TOKEN}&message=$(echo "${MESSAGE}" | sed -e "s/%/%25/g")&title=${1}&priority=${PRIORITY}&sound=cosmic" https://api.pushover.net/1/messages.json >/dev/null 2>&1
-			}
-			if [ "${startup}" == "true" ]; then
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_WATTS}'watts - ${OFFSITE_BATT_CAP}'% Battery - ${OFFSITE_BATT_RUNTIME}'mins - Service startup" >> ${PW_LOGPOWER}
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Service startup" >> ${PW_LOGFILE}
-				SENDNOTICE "OFFSITE POWER MONITOR" "Service starting"
-				startup=false
-			fi
-			
-			if [ ${OFFSITE_VOLTIN%.*} -gt 105 ]; then
-				if [ -f ${PW_TMPFOLDER}/power.offsite.charging ] && [ ${OFFSITE_BATT_CAP%.*} -eq 100 ]; then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Charging Complete" >> ${PW_LOGFILE}
-					SENDNOTICE "OFFSITE POWER" "Batteries are fully recharged"
-					rm -f ${PW_TMPFOLDER}/power.offsite.charging
-				elif [ ${OFFSITE_BATT_CAP%.*} -lt 100 ] && [ ! -f ${PW_TMPFOLDER}/power.offsite.charging ]; then
-					touch ${PW_TMPFOLDER}/power.offsite.charging
-				fi
-				if [ -f ${PW_TMPFOLDER}/power.offsite.ac.low ]; 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}/shutdown.OFFSITE ]; then
-					if [ ! -f ${PW_TMPFOLDER}/power.offsite.restored ]; then
-						touch ${PW_TMPFOLDER}/power.offsite.restored
-
-					elif [ $(expr `date +%s` - $(stat -f %m ${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}
-						SENDNOTICE "OFFSITE HOST POWER" "Powering offsite host(s) back ONLINE after power outage"
-						for host in ${PW_OFFSITEHOSTS_IDRAC}; do
-							if [ "${TEST}" == "" ] || [ "${TEST}" == "full" ]; then
-								ipmitool -I lanplus -H ${host} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power on &
-								run=$(ssh root@${PW_VCENTERHOST} "sed -i '/<domain-c105105>/{n;s/<enabled>.*<\/enabled>/<enabled>True<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
-								run=$(ssh root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1)
-								run=$(ssh root@${PW_VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1)
-							else
-								echo "TESTMODE: Powering up '${host}'"
-							fi
-						done
-						rm -f ${PW_TMPFOLDER}/power.offsite.*
-					fi
-				fi
-				logtime=$(expr `date +%s` - $(stat -f %m ${PW_LOGPOWER}))
-				if [ ${logtime} -ge $(echo "scale=0; ${PW_LOG_INTERVAL_NORMAL}*60" | bc) ] || ([ ${OFFSITE_BATT_CAP%.*} -lt 100 ] && [ ${logtime} -gt ${PW_LOG_INTERVAL_CHARGING} ]); then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_WATTS}'watts - ${OFFSITE_BATT_CAP}'% Battery - ${OFFSITE_BATT_RUNTIME}'mins - Normal" >> ${PW_LOGPOWER}
-				fi
-			else
-				[ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low ] && touch ${PW_TMPFOLDER}/power.offsite.ac.low
-				
-				if [ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low.notice ] || [ $(expr `date +%s` - $(stat -f %m ${PW_TMPFOLDER}/power.offsite.ac.low.notice)) -gt $(echo "scale=2; ${PW_RENOTIFY_LOWPOWER}*60" | bc) ]; then
-					# echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_BATT_CAP}'% Battery - Powering LOW/OFF!" >> ${PW_LOGFILE}
-					SENDNOTICE "OFFSITE POWER - POWER OFF/LOW!!" "Power off or low voltage detected" 1
-					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 -f %m ${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
-					for host in ${PW_OFFSITEHOSTS}; do
-						if [ "${TEST}" = "" ] || [ "${TEST}" = "full" ]; then
-							run=$(ssh root@${PW_VCENTERHOST} "sed -i '/<domain-c105105>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
-							run=$(ssh root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1)
-							run=$(ssh root@${PW_VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1)
-							ssh root@${host} sh < ${PW_FOLDER}/esxi-scripts/esxi-shutdown2.sh &
-						fi
-					done
-				fi
-				if [ $(expr `date +%s` - $(stat -f %m ${PW_LOGPOWER})) -gt ${PW_LOG_INTERVAL_ABNORMAL} ]; then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) -   ${OFFSITE_VOLTIN}'volts - ${OFFSITE_WATTS}'watts - ${OFFSITE_BATT_CAP}'% Battery - ${OFFSITE_BATT_RUNTIME}'mins - OFF/LOW POWER!!" >> ${PW_LOGPOWER}
-				fi
-			fi
-		
-		else
-			if [ ! -f ${PW_TMPFOLDER}/power.ups.losscomm ]; then
-				touch ${PW_TMPFOLDER}/power.ups.losscomm
-				
-			elif [ $(expr `date +%s` - $(stat -f %m ${PW_TMPFOLDER}/power.ups.losscomm)) -ge 60 ]; then
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) -   0.0'volts -   0'% Battery - Restarting NUT service" >> ${PW_LOGFILE}
-				SENDNOTICE "NUT DRIVER FAILURE" "Restarting NUT service"
-				/usr/local/etc/rc.d/nut.sh restart
-				sleep 10s
-				touch ${PW_TMPFOLDER}/power.ups.losscomm
-			fi
-		fi
-		sleep 5s
-	done
-}
-
-PWO_STOP(){
-	ps -U root | grep "offsite-power-check.sh start" | grep -v "grep" | awk '{print $1}' | xargs kill
-}
-
-PWO_RESTART() {
-	PWO_STOP
-	sleep 2s
-	/opt/idssys/powerwall/offsite-power-check.sh start &
-
-}
-
-LOGROTATE(){
-	lm=`expr $(date +'%m') - 1`
-	if [ ${lm} = 0 ]; then
-		lm=12
-		ly=`expr $(date +'%Y') - 1`
-	else
-		ly=$(date +'%Y')
-	fi
-	[ ${lm} -lt 10 ] && lm="0${lm}"
-	ARCHIVEFOLDER=${PW_LOGARCHIVE}/${ly}-${lm}
-	mkdir -p ${ARCHIVEFOLDER}
-	PWO_STOP
-	mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/ 2> /dev/null
-	PWO_START
-	i=0
-	for folder in $(ls -d ${PW_LOGARCHIVE}/* 2> /dev/null | sort -r); do
-		i=`expr ${i} + 1`
-		[ ${i} -gt 12 ] && rm -Rf ${folder}
-	done
-}
-
-case $1 in
-	start) PWO_START &;;
-	stop) PWO_STOP;;
-	restart) PWO_RESTART;;
-	logrotate) LOGROTATE;;
-	update)
-		if curl -m 5 -s --head  --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then 
-			# cd /opt/idssys/defaults
-			# if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
-			# 	git fetch origin master >/dev/null 2>&1
-			# 	git reset --hard origin/master >/dev/null 2>&1
-			# 	git reflog expire --expire=now --all >/dev/null 2>&1
-			# 	git repack -ad >/dev/null 2>&1
-			# 	git prune >/dev/null 2>&1
-			# 	git pull >/dev/null 2>&1
-			# 	git submodule update --remote >/dev/null 2>&1
-			# fi
-			cd ${PW_FOLDER}
-			if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
-				git fetch origin master >/dev/null 2>&1
-				git reset --hard origin/master >/dev/null 2>&1
-				git reflog expire --expire=now --all >/dev/null 2>&1
-				git repack -ad >/dev/null 2>&1
-				git prune >/dev/null 2>&1
-				git pull >/dev/null 2>&1
-				echo "Updated, restarting services"
-				/opt/idssys/powerwall/offsite-power-check.sh restart &
-			else
-				echo "No update available"
-			fi
-		else
-			echo "Cannot connect to GIT server"
-		fi
-	;;
-esac
-
-
-exit 0
-
-
-
-
-
-

run.sh

@@ -6,6 +6,9 @@ source /opt/idssys/defaults/default.inc
 source /opt/idssys/powerwall/defaults.inc
 
 if [ "${1}" == "update" ]; then
+	if [ "${2}" == "-a" ] || [ "${2}" == "all" ]; then
+		echo -e "${idsCL[White]}Updating the Mainsite Monitor...${idsCL[Default]}"
+	fi
 	if curl -m 5 -s --head  --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then 
 		if [ "${2}" != "q" ]; then
 			echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
@@ -40,25 +43,45 @@ if [ "${1}" == "update" ]; then
 			git pull >/dev/null 2>&1
 			git submodule update --remote >/dev/null 2>&1
 			/bin/chmod +x /opt/idssys/powerwall/powerwall.sh 2>&1
-			source ${PW_FOLDER}/defaults.inc
+			source /opt/idssys/powerwall/defaults.inc
+			
 			if [ "${2}" != "q" ]; then
 				echo -en "\e[1A";
-				echo -e "\e[0K\r ${idsCL[Green]}Update to v${VERS} complete${idsCL[Default]}\n"
+				echo -e "\e[0K\r ${idsCL[Green]}Update to v${PW_VERS} complete${idsCL[Default]}"
 			fi
-			read -n 1 -p "Do you want to restart PowerWall Services? (y/N): " choice
-			case "$choice" in
-			[Yy])
-				echo -e "\n\n${idsCL[Yellow]}Restarting Powerwall services to apply update ..."
-				${PW_SCRIPT} service all restart
-				;;
-			*) echo;;
-			esac
+			touch ${PW_TMPFOLDER}/.nosend_update
+			if [ "${2}" != "q" ] && [ "${2}" != "y" ] && [ "${2}" != "n" ]; then
+				if [ -f ${NM_TMPFOLDER}/.singleserver.PW.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO.primary ]; then
+					echo -en "${idsCL[LightCyan]}Do you want to restart PowerWall Services as well? (y/N): "
+					read -n 1 choice
+					case "$choice" in
+					[Yy])
+						echo -e "\n\n${idsCL[Yellow]}Restarting Powerwall services to apply update ..."
+						${PW_SCRIPT} service all restart
+						;;
+					*) echo;;
+					esac
+				fi
+				
+			elif [ "${2}" == "y" ]; then
+				([ -f ${NM_TMPFOLDER}/.singleserver.PW.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO.primary ]) && ${PW_SCRIPT} service all restart
+				
+			elif [ "${2}" == "q" ]; then
+				([ -f ${NM_TMPFOLDER}/.singleserver.PW.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO.primary ]) && ${PW_SCRIPT} service all restart >/dev/null 2>&1
+			fi
+			sleep 30s && rm -f ${PW_TMPFOLDER}/.nosend_update &
 			
 		elif [ "${2}" != "q" ]; then
 			echo -en "\e[1A";
 			echo -e "\e[0K\r ${idsCL[LightCyan]}No Updates Available${idsCL[Default]}\n"
 		fi
+		
 	fi
+	if [ "${2}" == "-a" ] || [ "${2}" == "all" ]; then
+		echo -e "${idsCL[White]}Updating the Offsite Monitor...${idsCL[Default]}"
+		${SSHCMD} root@${PW_OFFSITE_MONITOR} "pw update"
+	fi
+	
 else
 	${PW_SCRIPT} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10}
 fi
@@ -66,6 +89,3 @@ fi
 
 exit 0
 
-
-
-