From d6d118e7368efd10b97fec25c3f346b7d578a355 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 12 Mar 2024 14:58:16 -0500 Subject: [PATCH] Update defaults.inc --- defaults.inc | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/defaults.inc b/defaults.inc index 9b5cee5..6cf645a 100755 --- a/defaults.inc +++ b/defaults.inc @@ -7,24 +7,15 @@ DS_CRONTAB_FOLDER=/opt/idssys/nodemgmt/crontabs noheader=" gettsip-node get-crontabs get-crontab update report updatenodes runcmd " - -if [ "${NM_NODEMANAGER}" != "" ]; then - def_nmip=${NM_NODEMANAGER} - def_mysqlip=${NM_SINGLESRVR_IP['MYSQL']} -else - def_nmip=10.10.10.60 - def_mysqlip=10.10.1.50 -fi - -# [ "$(CHECK_HOST ${def_mysqlip})" == "false" ] && def_mysqlip='' - - if [ "${TAILSCALE}" == "true" ]; then nmip=${NM_NODEMANAGER_TS} - mysqlip=100.100.2.2 + mysqlip=${NM_NODEMANAGER_TS} +elif [ "${NM_NODEMANAGER}" != "" ]; then + nmip=${NM_NODEMANAGER} + mysqlip=${NM_SINGLESRVR_IP['MYSQL']} else - nmip=${def_nmip} - mysqlip=${def_mysqlip} + nmip=10.10.10.60 + mysqlip=10.10.1.50 fi SENDNOTICE(){