update

defaults.inc

@@ -1,16 +1,10 @@
 
-VERS='2.5.79-12292023'
+VERS='2.5.81-12302023'
 
 noheader=' update service dailytemp confsync '
 
 HC_CW=60
 
-# mqtt_conn='/usr/bin/mosquitto_sub -h 127.0.0.1 -u emonpi -P emonpimqtt'
-mqtt_conn='/usr/bin/mosquitto_sub -h 127.0.0.1 -u mqtt -P 12mqtt34password56'
-
-# mysql_conn='/usr/bin/mysql -h mysqldb.scity.us -P 6033 --user=sysmoninsert --password=sysmoninsert'
-mysql_conn='/usr/bin/mysql'
-
 PW_FOLDER='/opt/idssys/powerwall'
 PW_INCFOLDER=${PW_FOLDER}/inc
 PW_LOGFOLDER=${PW_FOLDER}/logs
@@ -31,6 +25,10 @@ M_SRVCOPT=(start stop restart reload enable disable)
 
 source ${PW_FOLDER}/settings.conf
 
+mqtt_conn="/usr/bin/mosquitto_sub -h 127.0.0.1 -u ${PW_MQTT_USER} -P ${PW_MQTT_USER}"
+# mysql_conn="/usr/bin/mysql -h ${PW_MYSQL_HOST} -P 6033 --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}"
+mysql_conn='/usr/bin/mysql'
+
 IFS=,
 PW_MAINSITEHOSTS=(${PW_MAINSITE_HOSTS})
 PW_MAIN_NOISCSIHOSTS=(${PW_MAIN_NOISCSI_HOSTS})