From 50d4995460382df3817cc525e31b5a18d6b90220 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 12 Dec 2023 17:58:58 -0600
Subject: [PATCH] update

---
 defaults.inc | 22 ++++++++++++----------
 powerwall.sh |  1 -
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 114cf494..d55b0115 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,8 @@
 
 VERS='2.5.6-12112023'
 
+source ${PW_FOLDER}/settings.conf
+
 noheader=' update service dailytemp confsync '
 hc_cw=60
 
@@ -26,6 +28,16 @@ PW_LOGPOWER=${PW_LOGFOLDER}/log-power
 
 M_SRVCOPT=(start stop restart reload enable disable)
 
+IFS=,
+PW_MAINSITEHOSTS=(${PW_MAINSITE_HOSTS})
+PW_MAINHOSTS=(${PW_MAIN_HOSTS})
+PW_SYSHOSTS=(${PW_SYS_HOSTS})
+PW_OFFSITEHOSTS=(${PW_OFFSITE_HOSTS})
+PW_ALLHOSTS=(${PW_ALL_HOSTS})
+unset IFS
+
+echo "HERE!!!: ${PW_SYS_HOSTS}"
+
 if [ -f ${PW_FOLDER}/settings.local.conf ]; then
 	declare -A PW_POWERWALL_SERVICES
 	declare -A PW_THRESHOLDS
@@ -45,16 +57,6 @@ if [ -f ${PW_FOLDER}/settings.local.conf ]; then
 	
 	source ${PW_FOLDER}/settings.local.conf
 	
-	IFS=,
-	PW_MAINSITEHOSTS=(${PW_MAINSITE_HOSTS})
-	PW_MAINHOSTS=(${PW_MAIN_HOSTS})
-	PW_SYSHOSTS=(${PW_SYS_HOSTS})
-	PW_OFFSITEHOSTS=(${PW_OFFSITE_HOSTS})
-	PW_ALLHOSTS=(${PW_ALL_HOSTS})
-	unset IFS
-	
-	echo "HERE!!!: ${PW_SYS_HOSTS}"
-	
 else
 	echo "NO settings.local.conf FILE FOUND"
 	[ "${1}" ] && [ "${1}" != "update" ] && exit 1
diff --git a/powerwall.sh b/powerwall.sh
index 37ef7d8d..85e65ae2 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -6,7 +6,6 @@ PW_ACTION="${1}"
 source /opt/idssys/defaults/colors.inc
 source /opt/idssys/defaults/default.inc
 source /opt/idssys/powerwall/defaults.inc
-source ${PW_FOLDER}/settings.conf
 source ${PW_FOLDER}/shutdown-test.sh
 
 TEST=true