From f46431c8f2f403db99375aa5de8c01bc496070a6 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 10 Nov 2024 09:00:42 -0600 Subject: [PATCH] update --- defaults.inc | 4 +--- inc/temp.inc.sh | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 8447c9fe..8c956c22 100755 --- a/defaults.inc +++ b/defaults.inc @@ -30,11 +30,9 @@ 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=local 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 @@ -85,7 +83,7 @@ if [ -f ${PW_FOLDER}/conf/settings.${loo}.conf ]; then declare -A PW_MISCSENSOR_DESC declare -A PW_DESC_TEMP - source ${PW_FOLDER}/conf/settings.${loo}.conf + source ${PW_FOLDER}/conf/settings.local.conf [ "${PW_TEMPIND_DIFF}" == "" ] && PW_TEMPIND_DIFF=1 diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 743c9901..93a677a6 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -367,6 +367,7 @@ CHECKTEMP(){ fi DIVIDER . yellow ${PRI_WIDTH} for SENSOR in ${PW_SENSOR_ORD[@]}; do + echo $SENSOR if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ] && ([ "${exclude}" == "" ] || [[ ! "${SENSOR,,}" = *"${exclude,,}"* ]]) && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" = "offsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.2.1."* ]]) ); then vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]} vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]}