From 51e85eadefca6c5d7c7aa3b0d29755d84e9ee708 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 1 Jan 2023 09:26:43 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 6b41dcba..b7711ebb 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -93,7 +93,7 @@ STATUS(){
 						if [ "${ST_ACTION}" != "check" ]; then
 							echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
 						fi
-						if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${NM_SERVICES[${srvc}]} is down\t$(date)" | mail -s "${NODE_HOSTNAME}" ${STATUS_CHECK_EMAIL}; fi
+						if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "${NM_SERVICES[${srvc}]} is down\t$(date)" | mail -s "${NODE_HOSTNAME}" ${EMAIL_NOTICE}; fi
 						touch ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down
 					else
 						errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down)
@@ -105,7 +105,7 @@ STATUS(){
 							if [ "${ST_ACTION}" != "check" ]; then
 								echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 							fi
-							# if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NODE_HOSTNAME}" ${STATUS_CHECK_EMAIL}; fi
+							# if [ "${EMAIL_NOTICE}" != "" ]; then echo "${NM_SERVICES[${srvc}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NODE_HOSTNAME}" ${EMAIL_NOTICE}; fi
 							touch ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down
 						fi
 					fi
@@ -119,7 +119,7 @@ STATUS(){
 						else
 							toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down)
 						fi
-						if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})\t$(date)" | mail -s "${NODE_HOSTNAME}" ${STATUS_CHECK_EMAIL}; fi
+						if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})\t$(date)" | mail -s "${NODE_HOSTNAME}" ${EMAIL_NOTICE}; fi
 						rm -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down
 						rm -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.errtime
 					fi
@@ -180,7 +180,7 @@ STATUS(){
 								toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}.down)
 							fi
 							rm -f ${FOLDER}/${nip}.down; rm -f ${FOLDER}/${nip}.errtime
-							# if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_NODETYPES[$NTYPE]}-Node${nid} is back UP! It was down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-UP" ${STATUS_CHECK_EMAIL}; fi
+							# if [ "${EMAIL_NOTICE}" != "" ]; then echo "${NM_NODETYPES[$NTYPE]}-Node${nid} is back UP! It was down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-UP" ${EMAIL_NOTICE}; fi
 						fi
 						
 						if [ "${ST_ACTION}" != "dockers" ]; then
@@ -222,7 +222,7 @@ STATUS(){
 												if [ "${ST_ACTION}" != "check" ]; then
 													echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
 												fi
-												if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${NM_SERVICES[${srvc}]} is down\t$(date)" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
+												if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "${NM_SERVICES[${srvc}]} is down\t$(date)" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${EMAIL_NOTICE}; fi
 												touch ${FOLDER}/${nip}-${srvc}.down
 											# fi
 										else
@@ -235,7 +235,7 @@ STATUS(){
 												if [ "${ST_ACTION}" != "check" ]; then
 													echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 												fi
-												# if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
+												# if [ "${EMAIL_NOTICE}" != "" ]; then echo "${NM_SERVICES[${srvc}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${EMAIL_NOTICE}; fi
 												touch ${FOLDER}/${nip}-${srvc}.down
 												if [ "${srvc}" = "mysql" ]; then
 													${NCMD} systemctl restart ${srvc}
@@ -252,7 +252,7 @@ STATUS(){
 											else
 												toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.down)
 											fi
-											if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})\t$(date)" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
+											if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})\t$(date)" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${EMAIL_NOTICE}; fi
 
 											if [ "${srvc}" == "pdnsadmin.socket" ] || [ "${srvc}" == "pdnsadmin" ] || [ "${srvc}" == "gitea" ]; then
 												rm -f ${FOLDER}/*-${srvc}.down
@@ -296,7 +296,7 @@ STATUS(){
 										if [ "${ST_ACTION}" != "check" ]; then
 											echo -e "${idsCL[Green]}Running - Fixed${idsCL[Default]}"
 										fi
-										if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${NM_DOCKERS[${docker}]} is fixed\t$(date)" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
+										if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "${NM_DOCKERS[${docker}]} is fixed\t$(date)" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${EMAIL_NOTICE}; fi
 										rm -f ${FOLDER}/${nip}-${docker}.down
 										rm -f ${FOLDER}/${nip}-${docker}.errtime
 									else
@@ -304,7 +304,7 @@ STATUS(){
 											echo -e "${idsCL[Red]}Not Running - Could Not Fix!${idsCL[Default]}"
 										
 											if [ ! -f ${FOLDER}/${nip}-${docker}.down ]; then
-												if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${NM_DOCKERS[${docker}]} is down\t$(date)" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
+												if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "${NM_DOCKERS[${docker}]} is down\t$(date)" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${EMAIL_NOTICE}; fi
 												touch ${FOLDER}/${nip}-${docker}.down
 											else
 												errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${docker}.down)
@@ -338,13 +338,13 @@ STATUS(){
 							if [ ! -f ${FOLDER}/${nip}.errtime ]; then
 								touch ${FOLDER}/${nip}.errtime
 							fi
-							# if [ "${STATUS_CHECK_EMAIL}" != "" ]; then
-							# 	echo "${NM_NODETYPES[$NTYPE]}-Node${nid} is down" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}
+							# if [ "${EMAIL_NOTICE}" != "" ]; then
+							# 	echo "${NM_NODETYPES[$NTYPE]}-Node${nid} is down" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${EMAIL_NOTICE}
 							# fi
 						else
 							errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}.down)
-							# if [ $errtime -gt ${RENOTIFY} ] && [ "${STATUS_CHECK_EMAIL}" != "" ]; then
-							# 	echo "${NM_NODETYPES[$NTYPE]}-Node${nid} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}
+							# if [ $errtime -gt ${RENOTIFY} ] && [ "${EMAIL_NOTICE}" != "" ]; then
+							# 	echo "${NM_NODETYPES[$NTYPE]}-Node${nid} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${EMAIL_NOTICE}
 							# fi
 						fi
 						if [ "${ST_ACTION}" != "check" ]; then
@@ -402,7 +402,7 @@ STATUS(){
 							if [ "${checkhost}" != "false" ]; then
 								if [ -f ${FOLDER}/${nip}.down ]; then
 									rm -f ${FOLDER}/${nip}.down
-									# if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_NODETYPES[$NTYPE]}-Node${nid} is back UP!" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-UP" ${STATUS_CHECK_EMAIL}; fi
+									# if [ "${EMAIL_NOTICE}" != "" ]; then echo "${NM_NODETYPES[$NTYPE]}-Node${nid} is back UP!" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-UP" ${EMAIL_NOTICE}; fi
 								fi
 								var2=${NTYPE}_REPL_CHECK[@]
 								# timeout=`date --date='20 seconds' +%s`
@@ -452,7 +452,7 @@ STATUS(){
 										fi
 										if [ ! -f ${FOLDER}/${nip}-${rcheck}.down ]; then
 											touch ${FOLDER}/${nip}-${rcheck}.down
-											if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})\t$(date)" | mail -s "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
+											if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})\t$(date)" | mail -s "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${EMAIL_NOTICE}; fi
 										fi
 									else
 										if [ "${ST_ACTION}" != "check" ]; then
@@ -460,7 +460,7 @@ STATUS(){
 										fi
 										if [ -f ${FOLDER}/${nip}-${rcheck}.down ]; then
 											rm -f ${FOLDER}/${nip}-${rcheck}.down
-											if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})\t$(date)" | mail -s "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
+											if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})\t$(date)" | mail -s "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${EMAIL_NOTICE}; fi
 										fi
 									fi
 						
@@ -471,7 +471,7 @@ STATUS(){
 								fi
 								if [ ! -f ${FOLDER}/${nip}.down ]; then
 									touch ${FOLDER}/${nip}.down
-									# if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_NODETYPES[$NTYPE]}-Node${nid} is down" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-DOWN" ${STATUS_CHECK_EMAIL}; fi
+									# if [ "${EMAIL_NOTICE}" != "" ]; then echo "${NM_NODETYPES[$NTYPE]}-Node${nid} is down" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-DOWN" ${EMAIL_NOTICE}; fi
 								fi
 							fi
 							if [ "${ST_ACTION}" != "check" ]; then echo; fi
@@ -548,12 +548,12 @@ STATUS(){
 							if [ "${freespace}" -le "1000" ]; then
 								fs_status='error'
 								fs_status_color='Red'
-								if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${partition} : ${freespace} MB free\t$(date)" | mail -s "Free Space Critical: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
+								if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "${partition} : ${freespace} MB free\t$(date)" | mail -s "Free Space Critical: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${EMAIL_NOTICE}; fi
 
 							elif [ "${freespace}" -le "5000" ]; then
 								fs_status='warn'
 								fs_status_color='Yellow'
-								if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo -e "${partition} : ${freespace} MB free\t$(date)" | mail -s "Free Space Warning: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
+								if [ "${EMAIL_NOTICE}" != "" ]; then echo -e "${partition} : ${freespace} MB free\t$(date)" | mail -s "Free Space Warning: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${EMAIL_NOTICE}; fi
 								
 							else
 								fs_status=''
@@ -1024,9 +1024,9 @@ CHECK-CERTS(){
 	if [ "${1}" = "check" ]; then
 		rm -f ${FOLDER}/ssl-cert-check.lastrun
 		${FOLDER}/ssl-cert-check/ssl-cert-check -a -f ${FOLDER}/ssl-cert-check/ssldomains > ${FOLDER}/ssl-cert-check.lastrun
-		if [ "${STATUS_CHECK_EMAIL}" != "" ]; then
+		if [ "${EMAIL_NOTICE}" != "" ]; then
 			SSLLOG="$(cat ${FOLDER}/ssl-cert-check.lastrun)"
-			[ "${STATUS_CHECK_EMAIL}" != "" ] && echo "SSL Certs Check\n\n$SSLLOG" | mail -s "SSL Certs Check" ${STATUS_CHECK_EMAIL}
+			[ "${EMAIL_NOTICE}" != "" ] && echo "SSL Certs Check\n\n$SSLLOG" | mail -s "SSL Certs Check" ${EMAIL_NOTICE}
 		fi
 		
 	else
@@ -2441,7 +2441,7 @@ if [ ${action-x} ]; then
 				if [ "${2}" = "report" ]; then
 					rm -f ${FOLDER}/status-check.lastrun
 					STATUS report ${3} > ${FOLDER}/status-check.lastrun
-					if [ "${3}" = "email" ] && [ "${STATUS_CHECK_EMAIL}" != "" ]; then
+					if [ "${3}" = "email" ] && [ "${EMAIL_NOTICE}" != "" ]; then
 						echo -e "\n\n" >> ${FOLDER}/status-check.lastrun
 						DOWNLIST report >> ${FOLDER}/status-check.lastrun
 						STATUSLOG="$(cat ${FOLDER}/status-check.lastrun)"