diff --git a/defaults.inc b/defaults.inc index bff1d8b6..0050f431 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.1.111-05102024' +VERS='5.1.113-05102024' 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 8c2e4e26..b291b586 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -579,13 +579,7 @@ STATUS_NODE(){ SSCHK=primary fi else - if [ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2xx" ] || [ "${nip}" == "10.2.1.51xx" ]); then - SSCHK=false - elif [ "${nip}" == "10.2.1.5" ] && ([ "${srvc}" == "syncthing@pdns" ]); then - SSCHK=false - else - SSCHK=true - fi + SSCHK=true fi if [ ${SSCHK} != false ]; then @@ -645,7 +639,7 @@ 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" ]) || ([ "${nip}" == "10.2.1.5" ] && ([ "${srvc}" == "syncthing@pdns" ])); 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 echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled${idsCL[Default]}" else @@ -830,7 +824,7 @@ REPLCHECK(){ timeout=`date --date='1 minutes' +%s` # timeout=`date --date='30 seconds' +%s` - if [ "${nip}" == "10.2.1.5" ] && ([ "${rcheck}" == "pdns" ] || [ "${rcheck}" == "pdnsadmin" ]); then + if [ "${nip}" == "10.2.1.5xxx" ] && ([ "${rcheck}" == "pdns" ] || [ "${rcheck}" == "pdnsadmin" ]); then rm -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.running touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.skip else