From 359c4dfc3b01c616762c0a58b5261e67b160ec19 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 6 Jul 2023 19:37:45 -0500 Subject: [PATCH] update --- defaults.inc | 4 ++-- dsmon.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index f3c47a1..d1fcafb 100755 --- a/defaults.inc +++ b/defaults.inc @@ -5,10 +5,10 @@ VERS=2.2.15-07042023 DS_FOLDER=/opt/idssys/dsmon DS_CRONTAB_FOLDER=/opt/idssys/nodemgmt/crontabs -if [ "$(CHECK_HOST 10.10.10.50)" != "false" ]; then +if [ ${TAILSCALE} != true ] && [ "$(CHECK_HOST 10.10.10.50)" != "false" ]; then nmip=10.10.10.50 mysqlip=10.10.1.50 -elif [ "$(CHECK_HOST 100.100.55.1)" != "false" ]; then +elif [ ${TAILSCALE} == true ] || [ "$(CHECK_HOST 100.100.55.1)" != "false" ]; then nmip=100.100.55.1 mysqlip=100.100.5.2 else diff --git a/dsmon.sh b/dsmon.sh index b93167b..51a0c65 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -48,7 +48,7 @@ RUN(){ done QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','hdd','${DRIVE_INFO[@]}');" - echo $QRY + # echo $QRY MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "${QRY}" elif [ "${1}" = "sys" ]; then