From d939fb1aabe249d41e32d7146e87cdfa25a9d749 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 12 Aug 2023 19:32:10 -0500
Subject: [PATCH] update

---
 defaults.inc        |  2 +-
 inc/certs.inc       | 11 +++--------
 nodemgmt-scripts.sh |  8 +++++++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 1a329940..35330c05 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='4.10.55-08122023'
+VERS='4.10.58-08122023'
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns '
 CERT_DAEMON='/snap/bin/certbot'
diff --git a/inc/certs.inc b/inc/certs.inc
index c44b58b9..b6b41a2b 100755
--- a/inc/certs.inc
+++ b/inc/certs.inc
@@ -160,15 +160,10 @@ NIGHTLYRENEW(){
 	# rm -f ${NM_LOGFOLDER}/cert-renewal.lastrun
 	# ssh root@webserver-node2.scity.us service nginx stop
 	# sleep 5
-	mv -f ${NM_LOGFOLDER}/cert-renewal1.lastrun ${NM_LOGFOLDER}/cert-renewal2.lastrun >/dev/null 2>&1
-	mv -f ${NM_LOGFOLDER}/cert-renewal.lastrun ${NM_LOGFOLDER}/cert-renewal1.lastrun >/dev/null 2>&1
-	$CERT_DAEMON renew --webroot -w ${NM_CERTPATH}/letsencrypt-acme-challenge > ${NM_LOGFOLDER}/cert-renewal.lastrun >/dev/null 2>&1
+	$CERT_DAEMON renew --webroot -w ${NM_CERTPATH}/letsencrypt-acme-challenge
 	CONCAT_SSL
-	chown -R root:le ${NM_CERTPATH} >> ${NM_LOGFOLDER}/cert-renewal.lastrun
-	chmod -R 6775 ${NM_CERTPATH} >> ${NM_LOGFOLDER}/cert-renewal.lastrun
-	daterun=`date +%Y-%m-%d-%H-%M-%S`
-	echo -e "${daterun}" >> ${NM_CERTPATH}/cert-renewal.lastrun
-	yes | cp -rfH ${NM_LOGFOLDER}/cert-renewal.lastrun ${NM_CERTPATH}/cert-renewal.lastrun
+	chown -R root:le ${NM_CERTPATH}
+	chmod -R 6775 ${NM_CERTPATH}
 	SERVICE nginx reload >> ${NM_LOGFOLDER}/cert-renewal.lastrun
 }
 
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 1f243532..1b2d92da 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -772,7 +772,13 @@ GUI(){
 		copynpmcerts) COPYCERTS_NPM ${2};;
 		checknpmcerts) CHECK_NPMCERTS;;
 		checkcerts) CHECK-CERTS ${2};;
-		nightlyrenew) NIGHTLYRENEW;;
+		nightlyrenew)
+			mv -f ${NM_LOGFOLDER}/cert-renewal1.lastrun ${NM_LOGFOLDER}/cert-renewal2.lastrun >/dev/null 2>&1
+			mv -f ${NM_LOGFOLDER}/cert-renewal.lastrun ${NM_LOGFOLDER}/cert-renewal1.lastrun >/dev/null 2>&1
+			NIGHTLYRENEW > ${NM_LOGFOLDER}/cert-renewal.lastrun
+			echo -e "\n$(date +%Y-%m-%d-%H-%M-%S)" >> ${NM_CERTPATH}/cert-renewal.lastrun
+			yes | cp -rfH ${NM_LOGFOLDER}/cert-renewal.lastrun ${NM_CERTPATH}/cert-renewal.lastrun
+			;;
 		delsite) DELSITE ${2} ${3} ${4} ${5};;
 		delsites) DELSITES;;
 		newsite) NEWSITE ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22} ${23} ${24} ${25};;