From ae7d845f66fb8e9fd6cd28b907c109d97eedba38 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 27 May 2025 20:49:33 -0500
Subject: [PATCH] Update defaults.inc

---
 defaults.inc | 42 +++++++++---------------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 40700ee3..4e53dc8e 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.5.2-05262025'
+VERS='5.5.4-05272025'
 NM_BETA=false
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck offsite-staticroute-fix '
@@ -10,6 +10,10 @@ declare -i errtime
 [ "${NM_FOLDER}" == "" ] && NM_FOLDER=/opt/idssys/nodemgmt
 NM_SRVCOPT=(start stop restart reload enable disable)
 
+TSI=$(/sbin/ip link | grep tailscale0) && [ ${#TSI} != 0 ] && RUN_NODE_TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_TSIP=
+[ "$(ip route | awk '/default/ { print $5 }')" == "link" ] && RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) ||
+	RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
+
 if [ -f ${NM_FOLDER}/conf/defaults.local.inc ]; then
 	declare -A NM_HOSTS
 	declare -A NM_SERVICES_CHECK
@@ -33,34 +37,6 @@ if [ -f ${NM_FOLDER}/conf/defaults.local.inc ]; then
 	
 	source ${NM_FOLDER}/conf/defaults.local.inc
 	
-	TSI=$(/sbin/ip link | grep tailscale0) && [ ${#TSI} != 0 ] && RUN_NODE_TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_TSIP=
-	[ "$(ip route | awk '/default/ { print $5 }')" == "link" ] && RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) ||
-		RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
-	if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then
-		RUN_NODE_TYPE=NM;
-		RUN_NODE_IP=${RNIP}
-	else
-		for NTYPE in "${NM_NODE_TYPES[@]}"; do
-			if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && ([[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"${2}"* ]] || [ "${NTYPE}" == "${2^^}" ])); then
-				var=${NTYPE}_HOSTS[@]
-				RUN_NODE_TYPE=""
-				for nip in "${!var}"; do
-					# echo "${NTYPE} - $nip - ${RNIP} - ${RUN_NODE_TSIP}"
-					if [[ "${RNIP}" == *"${nip}"* ]]; then
-						RUN_NODE_TYPE=${NTYPE};
-						RUN_NODE_IP=${RNIP}
-						break 2
-					elif [[ "${RUN_NODE_TSIP}" == *"${nip}"* ]]; then
-						RUN_NODE_TYPE=${NTYPE};
-						RUN_NODE_IP=${RNIP}
-						break 2
-					fi
-				done
-			fi
-		done
-	fi
-	# echo "HERE: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP  RUN_NODE_TSIP=$RUN_NODE_TSIP (RNIP=$RNIP  TSI=$TSI)"
-	
 	[ "${NM_REPL_CHECK_TIMEOUT}" != "" ] && NM_REPL_CHECK_TIMEOUT=${NM_REPL_CHECK_TIMEOUT} || NM_REPL_CHECK_TIMEOUT=5   #MINUTES
 	
 	IFS=,
@@ -98,7 +74,7 @@ if [ -f ${NM_FOLDER}/conf/defaults.local.inc ]; then
 				arr_insert ${ntype}_DOCKERS_CHECK $value
 			done
 			arr_insert ${ntype}_DOCKERS_CHECK watchtower
-			[[ "${RUN_NODE_IP}" != "10.6."* ]] && arr_insert ${ntype}_DOCKERS_CHECK portainer_agent
+			[[ "${RNIP}" != "10.6."* ]] && arr_insert ${ntype}_DOCKERS_CHECK portainer_agent
 		fi
 		
 		if [ "${NM_REPL_CHECK[${ntype}]}" != "" ]; then
@@ -151,9 +127,7 @@ NM_LOGFILE=${NM_LOGFOLDER}/logfile
 NM_PDNS_WANDNS='wdns.scity.us'
 NM_PDNS_LANDNS='ldns.scity.us'
 
-TSI=$(/sbin/ip link | grep tailscale0) && [ ${#TSI} != 0 ] && RUN_NODE_TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_TSIP=
-[ "$(ip route | awk '/default/ { print $5 }')" == "link" ] && RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) ||
-	RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
+
 if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then
 	RUN_NODE_TYPE=NM;
 	RUN_NODE_IP=${RNIP}
@@ -177,6 +151,8 @@ else
 		fi
 	done
 fi
+# echo "HERE: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP  RUN_NODE_TSIP=$RUN_NODE_TSIP (RNIP=$RNIP  TSI=$TSI)"
+
 
 [ "${NM_REPL_NGINX_PATHS}" != "" ] && [ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_NGINXPATH=${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]} || NM_NGINXPATH=/etc/nginx
 if [ "${NM_CERTPATHS}" != "" ]; then