From 5d74d7a668989096fdc452e56ad5907cb972f597 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 6 Jul 2025 11:32:21 -0500
Subject: [PATCH] update

---
 defaults.inc  |  2 +-
 inc/certs.inc | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 6de754fa..df11939d 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.6.1-07062025'
+VERS='5.6.2a-07062025'
 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 bd033e7d..bee86f00 100755
--- a/inc/certs.inc
+++ b/inc/certs.inc
@@ -660,7 +660,7 @@ VCENTER-SSL(){
 }
 
 COPYCERTS(){
-	if [ -f ${NM_FOLDER}/conf/copycerts.sh.inc ]; then
+	if [ -f ${NM_FOLDER}/conf/copycerts.sh.inc ] && [ "${NM_COPYCERTS_HOST}" ] && [ "${NM_COPYCERTS_PATH}" ]; then
 		source ${NM_FOLDER}/conf/copycerts.sh.inc
 		
 		if [ "${COPYCERT}" ] && [ "${CERTFOLDER}" ]; then
@@ -677,12 +677,12 @@ COPYCERTS(){
 				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
+				scp le@${NM_COPYCERTS_HOST}:${NM_COPYCERTS_PATH}/${CERTSITE}/privkey.pem ${COPYTO}/privkey.pem >/dev/null 2>&1
 				if ! /usr/bin/md5sum -c ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 || [ "${1^^}" == "FORCE" ]; then
-					scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/* ${COPYTO}/ >/dev/null 2>&1
+					scp le@${NM_COPYCERTS_HOST}:${NM_COPYCERTS_PATH}/${CERTSITE}/* ${COPYTO}/ >/dev/null 2>&1
 					rm -f ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1
 					md5sum ${COPYTO}/privkey.pem > ${COPYTO}/privkey.pem.md5
-					# RUN_POST_COMMANDS=true
+					RUN_POST_COMMANDS=true
 					touch ${NM_LOGFOLDER}/copycerts.lastrun
 					echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
 				else
@@ -699,11 +699,11 @@ COPYCERTS(){
 			fi
 						
 		else
-			echo -e "${idsCL[Red]}Config file not complete, missing at least COPYCERT and/or CERTFOLDER variables${idsCL[Default]}\n"
+			echo -e "${idsCL[Red]}Config file not complete, missing at least \${COPYCERT} and/or \${CERTFOLDER} variables${idsCL[Default]}\n"
 			
 		fi
 	else
-		echo -e "${idsCL[Red]}No ${NM_FOLDER}/conf/copycerts.sh.inc config file found${idsCL[Default]}\n"
+		echo -e "${idsCL[Red]}No ${NM_FOLDER}/conf/copycerts.sh.inc config file found, or missing \${NM_COPYCERTS_HOST} and/or \${NM_COPYCERTS_PATH} variables${idsCL[Default]}\n"
 	fi
 }