From ff6742ff29ea7b94bba65f711a3373d57f113b82 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 13 May 2025 20:47:49 -0500 Subject: [PATCH] update --- defaults.inc | 4 ++-- inc/status.inc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index d2ba7678..497cdef5 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,7 +1,7 @@ #!/usr/bin/env bash -VERS='5.4.20e-05132025' -NM_BETA=true +VERS='5.4.21-05132025' +NM_BETA=false noheader=' 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 ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/status.inc b/inc/status.inc index b989ba19..5f6c5075 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -845,9 +845,9 @@ STATUS_NODE(){ fi if [ "${STATUS_ACTION}" != "check" ]; then if [ "${checkhost}" != "false" ]; then - echo -e "${idsCL[Red]} Node is online, but SSH is down!${idsCL[Default]}" + echo -e "${idsCL[Red]} Node is online, but SSH is down!${idsCL[Default]}" else - echo -e "${idsCL[Red]} Node is down! ${idsCL[Default]}" + echo -e "${idsCL[Red]} Node is down! ${idsCL[Default]}" fi fi # SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] is down" 1 @@ -871,9 +871,9 @@ STATUS_NODE(){ if [ "${STATUS_ACTION}" != "check" ]; then if [ "${checkhost}" != "false" ]; then - echo -e "${idsCL[LightRed]} Node SSH has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYellow]}${LH}${idsCL[Default]}" + echo -e "${idsCL[LightRed]} Node SSH has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYellow]}${LH}${idsCL[Default]}" else - echo -e "${idsCL[LightRed]} Node has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYellow]}${LH}${idsCL[Default]}" + echo -e "${idsCL[LightRed]} Node has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYellow]}${LH}${idsCL[Default]}" fi fi # if [ ${NM_ENABLE_RENOTIFY} -eq 1 ] && [ ! -f ${NM_TMPFOLDER}/${nip}.disable ] && ([ "${nip}" = "10.2.1.5" ] || [[ "${nip}" != *"10.2."* ]] || ([[ "${nip}" = *"10.2."* ]] && [ ! -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ])) && [ -f ${NM_TMPFOLDER}/${nip}.sent ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}.sent)) -gt ${NM_RENOTIFY_TIMEOUT} ]; then