From bdcf3f62e281661887720f93a1783d186a195490 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 6 Jul 2025 12:10:41 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index df11939d..59959069 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.6.2a-07062025' +VERS='5.6.3-07062025' NM_BETA=false noheader=' test 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 ' diff --git a/inc/status.inc b/inc/status.inc index ebe83977..13fe8724 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -882,13 +882,22 @@ STATUS_NODE(){ echo -e "\r\033[K ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} [${nip}]${idsST[Reset]}${idsCL[LightRed]} - Offline${idsCL[Default]}" DIVIDER false lightCyan ${DV_LEN} fi - [ ! -f ${STATUSRUN_TMPFOLDER}/.${nip}.down ] && touch ${STATUSRUN_TMPFOLDER}/.${nip}.down - rm -f ${NM_TMPFOLDER}/${nip}~* + + if [[ "${NM_IGNOREHOSTS_IFDOWN}" = *"${nip}"* ]]; then + if [ ! -f ${STATUSRUN_TMPFOLDER}/.${nip}.disable ]; then + rm -f ${NM_TMPFOLDER}/${nip}~* + touch ${STATUSRUN_TMPFOLDER}/.${nip}.disable + fi + else + [ ! -f ${STATUSRUN_TMPFOLDER}/.${nip}.down ] && touch ${STATUSRUN_TMPFOLDER}/.${nip}.down + rm -f ${NM_TMPFOLDER}/${nip}~* + fi + if [ ! -f ${NM_TMPFOLDER}/${nip}.down ]; then # if [ ! -f ${NM_TMPFOLDER}/${nip}.disable ] && ([[ "${nip}" != *"10.2."* ]] || ([[ "${nip}" = *"10.2."* ]] && [ ! -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ])); then - if [ ! -f ${NM_TMPFOLDER}/${nip}.disable ]; then - touch ${NM_TMPFOLDER}/${nip}.down - fi + + [ ! -f ${NM_TMPFOLDER}/${nip}.disable ] && touch ${NM_TMPFOLDER}/${nip}.down + if [ "${STATUS_ACTION}" != "check" ]; then if [ "${checkhost}" != "false" ]; then echo -e "${idsCL[Red]} Node is online, but SSH is down!${idsCL[Default]}"