From de7837c8314a1450743cc1e83f25a103364cb1fb Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 1 Jun 2025 13:56:59 -0500
Subject: [PATCH] update

---
 defaults.inc        |  2 +-
 inc/certs.inc       |  8 +++++++-
 inc/sites.inc       | 31 ++++++++++++++++++++-----------
 nodemgmt-scripts.sh |  6 +++++-
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index fb8af6aa..1e2d8168 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.5.13-06012025'
+VERS='5.5.14-06012025'
 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/certs.inc b/inc/certs.inc
index a58baaed..f0ee496d 100755
--- a/inc/certs.inc
+++ b/inc/certs.inc
@@ -86,7 +86,13 @@ NEWCERT(){
 				sed -i "s/#include conf.d\/include\/force-ssl.conf/include conf.d\/include\/force-ssl.conf/g" ${NM_NGINXPATH}/sites-available/${MAIN_CERT}.conf				
 				DIVIDER true
 				
-				[ ${NONGINXRESTART} -eq 0 ] && SERVICE_MGMT nginx restart
+				if [ ${NONGINXRESTART} -eq 0 ]; then
+					if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
+						SERVICE_MGMT nginx restart
+					else
+						/bin/systemctl restart nginx
+					fi
+				fi
 			fi
 			echo
 			echo -e "${idsCL[Green]}Certificate has been successfully created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Green]}'...${idsCL[Default]}"
diff --git a/inc/sites.inc b/inc/sites.inc
index a1b7a1b8..a815b26a 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -56,8 +56,11 @@ DELSITE(){
 		
 		[ "${NM_AUTHELIA_IP}" != "" ] && ${SSHCMD} root@${NM_AUTHELIA_IP} sed -i "/${DEL_SITE}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml
 		
-		SERVICE_MGMT nginx restart
-
+		if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
+			SERVICE_MGMT nginx restart
+		else
+			/bin/systemctl restart nginx
+		fi
 		echo -e "${idsCL[LightRed]}Site has been deleted.${idsCL[Default]}\n"
 	else
 		echo "Missing arguments"
@@ -342,11 +345,6 @@ NEWSITE(){
 
 			fi
 			
-			# if [ "${CREATE_SSL}" = "yes" ]; then
-			# 	[ -f ${NM_NGINXPATH}/sites-available/default* ] && SERVICE_MGMT nginx restart >/dev/null 2>&1
-			# 	NEWCERT ${NEW_SITE} newsite ${CERTTEST}
-			# fi
-			
 			daterun=`date +%Y-%m-%d-%H-%M-%S`
 			echo -e "${NEW_SITE}\n${daterun}" >| ${NM_LOGFOLDER}/new-site.lastrun
 			DIVIDER true
@@ -359,10 +357,18 @@ NEWSITE(){
 				if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then
 					echo
 				else
-					SERVICE_MGMT nginx restart
+					if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
+						SERVICE_MGMT nginx restart
+					else
+						/bin/systemctl restart nginx
+					fi
 				fi
 			else
-				SERVICE_MGMT nginx restart
+				if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
+					SERVICE_MGMT nginx restart
+				else
+					/bin/systemctl restart nginx
+				fi
 			fi
 		else
 			echo "Missing proxy arguments"
@@ -448,7 +454,6 @@ NEWPROXYSITE_CREATE(){
 			echo -en "${idsCL[LightCyan]}Enabling SSL ... "
 			if [ ! -f ${NM_CERTPATH}/live/${MAIN_SITE}/cert.pem ]; then
 				echo -e "\n${idsCL[LightCyan]}No SSL cert detected, will generate one now ... "
-				SERVICE_MGMT nginx restart
 				NEWCERT ${CERTTEST}-newsite -nnr ${NGINX_SERVERNAME}
 				echo
 			fi
@@ -910,7 +915,11 @@ EDITSITE(){
 					echo
 					
 					echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Restarting NGINX on all '${RUN_NODE_TYPE}' Nodes ... ${idsCL[Default]}"
-					SERVICE_MGMT nginx restart #>/dev/null 2>&1
+					if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
+						SERVICE_MGMT nginx restart
+					else
+						/bin/systemctl restart nginx
+					fi
 					echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
 					echo
 					
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 18528456..a17e64bf 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1539,7 +1539,11 @@ GUI(){
 				ln -s ${NM_NGINXPATH}/sites-available/${nfile##*/} ${nfile}
 				echo "Done"
 			done
-			SERVICE_MGMT nginx restart
+			if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
+				SERVICE_MGMT nginx restart
+			else
+				/bin/systemctl restart nginx
+			fi
 			;;
 		
 		gui) GUI;;