From a1f3f94d5786a86b2a624b06e28865c138ce46d4 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 1 Dec 2024 13:51:21 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index dbc14c03..79283c8e 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.3.16-12012024' +VERS='5.3.17-12012024' 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 ' diff --git a/inc/status.inc b/inc/status.inc index 33b2ca35..06ad2ed3 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -594,8 +594,8 @@ STATUS_NODE(){ else SSCHK=primary fi - elif ([ "${nip}" == "10.2.1.51" ] || [ "${nip}" == "10.2.1.240" ]) && [ "${srvc}" == "keepalived" ]; then - SSCHK=false + # elif ([ "${nip}" == "10.2.1.51" ] || [ "${nip}" == "10.2.1.240" ]) && [ "${srvc}" == "keepalived" ]; then + # SSCHK=false fi if [ ${SSCHK} == true ] || [ ${SSCHK} == primary ]; then [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: " @@ -656,7 +656,8 @@ STATUS_NODE(){ [ "${mysqlgo}" == "true" ] && unset mysqlgo [ "${SSCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}" - elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] || ([ "${nip}" != "10.2.1.5" ] && [[ "${nip}" = *"10.2."* ]] && [ -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ]) || ([ "${srvc}" == "keepalived" ] && [ "${nip}" == "10.2.1.51" ]); then + # elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] || ([ "${nip}" != "10.2.1.5" ] && [[ "${nip}" = *"10.2."* ]] && [ -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ]) || ([ "${srvc}" == "keepalived" ] && [ "${nip}" == "10.2.1.51" ]); then + elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ]; then echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled${idsCL[Default]}" elif [ "${SSCHK}" == "skip" ]; then