From 930ee2e6fff6233b86d3f544abf3376258c6b863 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 5 Jul 2025 15:55:09 -0500
Subject: [PATCH] update

---
 defaults.inc  |  2 +-
 inc/certs.inc | 63 ++++++++++++++++++++++++++-------------------------
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 1b6e4a51..8388a895 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.5.33-06302025'
+VERS='5.6.1a-07052025'
 NM_BETA=false
 
 noheader=' test 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 2cad675f..b3475efc 100755
--- a/inc/certs.inc
+++ b/inc/certs.inc
@@ -663,39 +663,40 @@ COPYCERTS(){
 	local COPYCERT=${1}
 	local CERTFOLDER=${2}
 	
-	if [ "${COPYCERT}" ] && [ "${CERTFOLDER}" ]; then
-	
-		arr COPYCERTS
-		arr CERTFOLDERS
-		IFS=,; var=(${COPYCERT}); unset IFS
-		for value in "${var[@]}"; do arr_insert COPYCERTS ${value}; done
-		IFS=,; var=(${CERTFOLDER}); unset IFS
-		for value in "${var[@]}"; do arr_insert CERTFOLDERS ${value}; done
-	
-		i=0
-		for CERTSITE in "${COPYCERTS[@]}"; do
-			c=0; spc=''; until [ $c = $(expr 35 - ${#CERTSITE}) ]; do spc="${spc} "; c=$(expr ${c} + 1); done
-			echo -en "${idsCL[LightCyan]}Updating ${idsCL[Green]}${CERTSITE}${spc}${idsCL[LightCyan]}: "
-			COPYTO=${CERTFOLDERS[${i}]}
-			NCF=false
-			scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/privkey.pem ${COPYTO}/privkey.pem >/dev/null 2>&1
-			if ! /usr/bin/md5sum -c ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 || [ "${3^^}" == "FORCE" ]; then
-				scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/* ${COPYTO}/ >/dev/null 2>&1
-				rm -f ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1
-				md5sum ${COPYTO}/privkey.pem > ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1
-				NCF=true
-				echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
-			else
-				echo -e "${idsCL[LightCyan]}No update needed${idsCL[Default]}"
-			fi
-			((i++))
-		done
-		echo
-		# [ ${NCF} = true ] && SERVICE_MGMT nginx reload
-		echo
+	if [ -f ${NM_FOLDER}/conf/copycerts.sh.inc ]; then
+		source ${NM_FOLDER}/conf/copycerts.sh.inc
 		
-	fi
+		if [ "${COPYCERT}" ] && [ "${CERTFOLDER}" ]; then
+			
+			arr COPYCERTS
+			arr CERTFOLDERS
+			IFS=,; var=(${COPYCERT}); unset IFS
+			for value in "${var[@]}"; do arr_insert COPYCERTS ${value}; done
+			IFS=,; var=(${CERTFOLDER}); unset IFS
+			for value in "${var[@]}"; do arr_insert CERTFOLDERS ${value}; done
 	
+			i=0; RUN_POST_COMMANDS=false
+			for CERTSITE in "${COPYCERTS[@]}"; do
+				c=0; spc=''; until [ $c = $(expr 35 - ${#CERTSITE}) ]; do spc="${spc} "; c=$(expr ${c} + 1); done
+				echo -en "${idsCL[LightCyan]}Updating ${idsCL[Green]}${CERTSITE}${spc}${idsCL[LightCyan]}: "
+				COPYTO=${CERTFOLDERS[${i}]}
+				scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/privkey.pem ${COPYTO}/privkey.pem >/dev/null 2>&1
+				if ! /usr/bin/md5sum -c ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 || [ "${3^^}" == "FORCE" ]; then
+					scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/* ${COPYTO}/ >/dev/null 2>&1
+					rm -f ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1
+					md5sum ${COPYTO}/privkey.pem > ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1
+					RUN_POST_COMMANDS=true
+					echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
+				else
+					echo -e "${idsCL[LightCyan]}No update needed${idsCL[Default]}"
+				fi
+				((i++))
+			done
+			echo
+			[ ${RUN_POST_COMMANDS} = true ] && COPYCERTS_POST_COMMANDS && echo
+			
+		fi
+	fi
 }