From 15b40c20cafb2eed087fcdcbae2713cd666a4f56 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 5 Mar 2024 17:02:23 -0600
Subject: [PATCH] update

---
 defaults.inc     |  2 +-
 inc/services.inc | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index a44f938e..dbd9f05f 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.1.95-03052024'
+VERS='5.1.96-03052024'
 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 '
diff --git a/inc/services.inc b/inc/services.inc
index 128e7cb7..d2177854 100755
--- a/inc/services.inc
+++ b/inc/services.inc
@@ -287,10 +287,21 @@ SERVICE_MGMT(){
 						if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
 							checked=false
 							until [ "${checked}" = "true" ]; do
-								checked="`${PH_CMD} ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl)) -le 90 ] && echo true`"
+								checked="`${PH_CMD} root@${nip} [ -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl)) -le 90 ] && echo true`"
 							done
 						fi
 					done
+					
+					for nip in "${!NT_HOSTS}"; do
+						checkhost=$(CHECK_HOST ${nip})
+						if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
+							unset checked1 checked2
+							until [ "${checked1}" = "true" ]; do
+								until [ "${checked2}" = "true" ]; do checked2="`${PH_CMD} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl ] && echo true`"; sleep 1s; done
+								checked1="`${PH_CMD} [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl)) -le 90 ] && echo true`"
+							done
+						fi
+					done					
 					${PH_CMD} rm -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl
 				fi
 			fi
@@ -307,7 +318,7 @@ SERVICE_MGMT(){
 					for nip in "${!NT_HOSTS}"; do
 						checkhost=$(CHECK_HOST ${nip})
 						if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
-							checked=false
+							unset checked1 checked2
 							until [ "${checked1}" = "true" ]; do
 								until [ "${checked2}" = "true" ]; do checked2="`${PH_CMD} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl ] && echo true`"; sleep 1s; done
 								checked1="`${PH_CMD} [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl)) -le 90 ] && echo true`"