Update defaults.inc

This commit is contained in:
2024-11-10 08:24:11 -06:00
parent fafc17dff5
commit 6b3de42c97

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
VERS='2.7.123d-11092024'
VERS='2.7.124-11102024'
noheader=' update service dailytemp confsync -r -report test '
@@ -28,6 +28,17 @@ M_SRVCOPT=(start stop restart reload enable disable)
source ${PW_FOLDER}/conf/settings.conf
IP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
if [[ "${IP}" = "10.2.1."* ]]; then
loo=offsite
mqtt_conn="/usr/bin/mosquitto_sub -h ${PW_IP} -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}"
mysql_conn='/usr/bin/mysql -h ${PW_MYSQL_HOST} --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}'
else
loo=local
mqtt_conn="/usr/bin/mosquitto_sub -h 127.0.0.1 -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}"
mysql_conn='/usr/bin/mysql'
fi
EMAIL_NOTICE=${PW_EMAIL_NOTICE}
PUSHOVER_APP_TOKEN=${PW_PUSHOVER_APP_TOKEN}
PUSHOVER_USER_TOKEN=${PW_PUSHOVER_USER_TOKEN}
@@ -41,10 +52,6 @@ if [ "${PW_FANINPUT}" == "" ]; then
fi
[ "${PW_ENABLE_RENOTIFY}" == "" ] && PW_ENABLE_RENOTIFY=1
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'
IFS=,
PW_MAINSITEHOSTS=(${PW_MAINSITE_HOSTS})
PW_MAIN_NOISCSIHOSTS=(${PW_MAIN_NOISCSI_HOSTS})
@@ -57,9 +64,6 @@ PW_ESXI_FANSPEEDCONTROLHOSTS=(${PW_ESXI_FANSPEEDCONTROL_HOSTS})
[ "${PW_TEMPIND_RANGE}" != "" ] && PW_TEMPIND_RANGE=(${PW_TEMPIND_RANGE})
unset IFS
IP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
[[ "${IP}" = "10.2.1."* ]] && loo=offsite || loo=local
if [ -f ${PW_FOLDER}/conf/settings.${loo}.conf ]; then
declare -A PW_POWERWALL_SERVICES
declare -A PW_THRESHOLDS