From e6eaa61451fc4e8eaac995f9953969c52518ce4f Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 20 Apr 2025 13:02:37 -0500
Subject: [PATCH] Update defaults.inc

---
 defaults.inc | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index c752dcaf..1083dbed 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.4.5-04202025'
+VERS='5.4.5c-04202025'
 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 '
@@ -131,20 +131,22 @@ if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then
 	RUN_NODE_IP=${RNIP}
 else
 	for NTYPE in "${NM_NODE_TYPES[@]}"; do
-		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
+		if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && [[ "${NM_SERVICES_CHECK[${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)"