update

defaults.inc

@@ -1,18 +1,32 @@
 #!/usr/bin/env bash
 
-VERS=2.2.36-11012023
+VERS=2.2.105-11252023
 
 DS_FOLDER=/opt/idssys/dsmon
 DS_CRONTAB_FOLDER=/opt/idssys/nodemgmt/crontabs
 
-if [ "${TAILSCALE}" != "true" ] && [ "$(CHECK_HOST 10.10.10.50)" != "false" ]; then
-	nmip=10.10.10.50
-	mysqlip=10.10.1.50
-elif [ "${TAILSCALE}" == "true" ] || [ "$(CHECK_HOST 100.100.55.1)" != "false" ]; then
-	nmip=100.100.55.1
+noheader=( )
+
+
+if [ "${NM_NODEMANAGER}" != "" ]; then
+	def_nmip=${NM_NODEMANAGER}
+	def_mysqlip=${NM_SINGLESRVR_IP['MYSQL']}
+else
+	def_nmip=10.10.10.50
+	def_mysqlip=10.10.1.50
+fi
+
+[ "$(CHECK_HOST ${NM_NODEMANAGER})" == "false" ] && def_mysqlip=''
+
+if [ "${TAILSCALE}" != "true" ] && [ "$(CHECK_HOST ${def_nmip})" != "false" ]; then
+	nmip=${def_nmip}
+	mysqlip=${def_mysqlip}
+elif [ "${TAILSCALE}" == "true" ] || [ "$(CHECK_HOST ${NM_NODEMANAGER_TS})" != "false" ]; then
+	nmip=${NM_NODEMANAGER_TS}
 	mysqlip=100.100.5.2
 else
 	nmip=
+	mysqlip=
 fi
 
 SENDNOTICE(){