update

defaults.inc

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.7.122-11092024'
+VERS='2.7.122b-11092024'
 
 noheader=' update service dailytemp confsync -r -report test '
 
@@ -26,7 +26,7 @@ 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
 
 EMAIL_NOTICE=${PW_EMAIL_NOTICE}
 PUSHOVER_APP_TOKEN=${PW_PUSHOVER_APP_TOKEN}
@@ -57,7 +57,7 @@ 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
+if [ -f ${PW_FOLDER}/conf/settings.local.conf ]; then
 	declare -A PW_POWERWALL_SERVICES
 	declare -A PW_THRESHOLDS
 	declare -A PW_SENSOR_TYPE
@@ -78,7 +78,7 @@ if [ -f ${PW_FOLDER}/settings.local.conf ]; then
 	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