From 4722086bdcb66eff5bc0232b8fb76484c4039180 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 6 Feb 2019 21:30:32 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 44c2271e..8bd79ba3 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -123,6 +123,7 @@ NEWCERT(){
 			DIVIDER true
 			echo -en "${idsCL[LightYellow]}Waiting for certifcate replication between the nodes... ${idsCL[Default]}"
 			checked=false
+			timeout=`date --date='2 minutes' +%s`
 			until [ "${checked}" = "" ]; do
 				tchecked=''
 				for nip in "${NODE_HOSTS[@]}"; do
@@ -134,9 +135,16 @@ NEWCERT(){
 					fi
 				done
 				checked=${tchecked}
+				if [ "`date +%s`" -gt "$timeout" ]; then
+					echo -e "${idsCL[Red]}Timeout${idsCL[Default]}"
+					timeout=true
+					echo "Timeout occured in waiting for replication between nodes." | mail -s "Cert-Request" ${STATUS_CHECK_EMAIL}
+					break
+				fi
 			done
-
-			echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
+			if [ "${timeout}" != "true" ]; then
+				echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
+			fi
 			echo 
 			SERVICE nginx reload
 			echo -e "${idsCL[Green]}Certificate has been successfully created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Green]}'...${idsCL[Default]}"
@@ -159,6 +167,7 @@ NEWCERT(){
 
 CERTRENEW(){
 	echo -e "${idsCL[LightGreen]}Renewing Certificates...${idsCL[Default]}"
+	echo
 	do_with_root $CERT_DAEMON renew --webroot -w /var/www/html 2>&1 | tee /opt/idssys/nodemgmt/cert-renewal.lastrun
 	do_with_root chown -R root:letsencrypt /etc/letsencrypt 2>&1 | tee -a /opt/idssys/nodemgmt/cert-renewal.lastrun
 	do_with_root chmod -R 6775 /etc/letsencrypt 2>&1 | tee -a /opt/idssys/nodemgmt/cert-renewal.lastrun
@@ -167,8 +176,9 @@ CERTRENEW(){
 	echo -e "${daterun}" >> /etc/letsencrypt/cert-renewal.lastrun
 	DIVIDER true
 	echo -en "${idsCL[LightYellow]}Waiting for certifcate replication between the nodes... ${idsCL[Default]}"
+	echo 
 	checked=false
-	timeout=`date --date='1 minutes' +%s`
+	timeout=`date --date='2 minutes' +%s`
 	until [ "${checked}" = "" ]; do
 		tchecked=''
 		for nip in "${NODE_HOSTS[@]}"; do
@@ -182,12 +192,22 @@ CERTRENEW(){
 		checked=${tchecked}
 		if [ "`date +%s`" -gt "$timeout" ]; then
 			echo -e "${idsCL[Red]}Timeout${idsCL[Default]}"
-			echo "Timeout occured in waiting for replication between nodes." | mail -s "Nightly-Cert-Renewal" ${STATUS_CHECK_EMAIL}
+			timeout=true
+			echo "Timeout occured in waiting for replication between nodes." | mail -s "Cert-Renewal" ${STATUS_CHECK_EMAIL}
 			break
 		fi
 	done
-	echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
+	if [ "${timeout}" != "true" ]; then
+		echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
+	fi
+	echo
 	SERVICE nginx reload 2>&1 | tee -a /opt/idssys/nodemgmt/cert-renewal.lastrun
+	echo -e "${idsCL[LightGreen]}The certificates have been renewed.${idsCL[Default]}"
+	echo ""
+	if [ -z $action ] || [ "${action}" = "gui" ]; then
+		DIVIDER true
+		ENTER2CONTINUE
+	fi
 }
 NIGHTLYRENEW(){
 	rm -f /opt/idssys/nodemgmt/cert-renewal.lastrun