From 1458a0eb35de0082c76f067d4d208f2269c78d87 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 17 Nov 2024 15:30:21 -0600
Subject: [PATCH] update

---
 defaults.inc     |  2 +-
 inc/services.inc | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 89080ea2..4b2f13fe 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.3.1-11132024'
+VERS='5.3.2-11172024'
 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 '
diff --git a/inc/services.inc b/inc/services.inc
index 1e159ebe..2e806988 100755
--- a/inc/services.inc
+++ b/inc/services.inc
@@ -5,13 +5,13 @@ SINGLE_SERVER_SERVICE_CHECK(){
 	dockerstocheck=${1^^}_SINGLESRVR_DOCKERS[@]
 	hosts=${1^^}_HOSTS[@]
 	
-	[ "${2^^}" == "START" ] && rm -f ${NM_TMPFOLDER}/.singleserver
+	[ "${2^^}" == "START" ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}
 		
 	if [[ "$(declare -p ${1^^}_SINGLESRVR_SERVICES)" =~ "declare -a" ]] || [[ "$(declare -p ${1^^}_SINGLESRVR_DOCKERS)" =~ "declare -a" ]]; then	
 		if [[ $(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) == *${NM_SINGLESRVR_IP[${1^^}]}* ]]; then
-			if [ ! -f ${NM_TMPFOLDER}/.singleserver ]; then
+			if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^} ]; then
 				SENDNOTICE "Node-Balancing Notice" "Starting SingleServer Services on ${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP}), stopping on other Nodes"
-				touch ${NM_TMPFOLDER}/.singleserver
+				touch ${NM_TMPFOLDER}/.singleserver.${1^^}
 			fi
 			gofor=false
 			if [ "${1^^}" == "WEBxx" ] && [ ! -f ${NM_REPL_CHECK_LOC['web-data']}/mounted ]; then
@@ -30,7 +30,7 @@ SINGLE_SERVER_SERVICE_CHECK(){
 						for nip in "${!hosts}"; do
 							if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then
 								ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} /bin/systemctl stop ${stc}
-								ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} rm -f ${NM_TMPFOLDER}/.singleserver
+								ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}
 							fi
 						done
 						sleep 3s
@@ -71,7 +71,7 @@ SINGLE_SERVER_SERVICE_CHECK(){
 			for docker in "${!dockerstocheck}"; do
 				[ "$(/usr/bin/docker ps -q -f name=${docker})" ] && /usr/bin/docker stop ${docker} & >/dev/null 2>&1
 			done
-			rm -f ${NM_TMPFOLDER}/.singleserver
+			rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}
 		fi
 	
 		[ "${1^^}" == "WEB" ] && [ "$(systemctl is-active nginx)" != "active" ] && ${NM_SCRIPT} service web restart ${RUN_NODE_IP}