From 86b8842cff30a8b511ed0b162e88a277c0d2ea77 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 26 Apr 2023 11:17:58 -0500 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 7622ba73..ba5def14 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1107,13 +1107,11 @@ CHECK_NPMCERTS(){ } CHECK-CERTS(){ - if [ "${1}" = "check" ]; then + 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 [ "${EMAIL_NOTICE}" != "" ]; then - SSLLOG="$(cat ${FOLDER}/ssl-cert-check.lastrun)" - SENDNOTICE "SSL Certs Check" "SSL Certs Check\n$SSLLOG" - fi + SSLLOG="$(cat ${FOLDER}/ssl-cert-check.lastrun)" + SENDNOTICE "SSL Certs Check" "SSL Certs Check\n$SSLLOG" else ${FOLDER}/ssl-cert-check/ssl-cert-check -a -f ${FOLDER}/ssl-cert-check/ssldomains @@ -2701,11 +2699,12 @@ if [ ${action-x} ]; then fi if [ ! -f "${FOLDER}/status-check.running" ]; then touch "${FOLDER}/status-check.running" - if [ "${2}" = "report" ]; then + if [ "${2}" == "report" ]; then rm -f ${FOLDER}/status-check.lastrun echo -e "$(date) - Starting status check #############################\n" > ${FOLDER}/status-check.lastrun STATUS report ${3} >> ${FOLDER}/status-check.lastrun - if [ "${3}" = "email" ] && [ "${EMAIL_NOTICE}" != "" ]; then + echo -e "\n\n$(date) - Finished status check #############################\n" > ${FOLDER}/status-check.lastrun + if [ "${3}" = "email" ]; then echo -e "\n\n" >> ${FOLDER}/status-check.lastrun DOWNLIST report >> ${FOLDER}/status-check.lastrun STATUSLOG="$(cat ${FOLDER}/status-check.lastrun)"