From 2be9ca1e1d094225b1bb51e900f3b368f553d08e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 13 Jun 2025 19:05:06 -0500 Subject: [PATCH] update --- defaults.inc | 4 ++-- inc/status.inc | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index 5cc33c8a..785479f3 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.5.20-06122025' +VERS='5.5.21-06132025' 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 ' @@ -74,7 +74,7 @@ if [ -f ${NM_FOLDER}/conf/defaults.local.inc ]; then arr_insert ${ntype}_DOCKERS_CHECK $value done arr_insert ${ntype}_DOCKERS_CHECK watchtower - [[ "${RNIP}" != "10.6."* ]] && arr_insert ${ntype}_DOCKERS_CHECK portainer_agent + ([[ "${RNIP}" != "10.6."* ]] && [ "${ntype}" != "ESPH" ]) && arr_insert ${ntype}_DOCKERS_CHECK portainer_agent fi if [ "${NM_REPL_CHECK[${ntype}]}" != "" ]; then diff --git a/inc/status.inc b/inc/status.inc index 2b79528b..4068ef4f 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -731,7 +731,7 @@ STATUS_NODE(){ echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Host Disabled${idsCL[Default]}" else - echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled - Secondary Node${idsCL[Default]}" + echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled - Backup Node${idsCL[Default]}" fi sr=`expr $sr + 1` @@ -760,8 +760,6 @@ STATUS_NODE(){ SDCHK=true if ${SSHCMD} root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then SDCHK=skip - elif ([ "${NM_HOSTNAMES[${nip}]}" == "ESPHome" ] && [ "${docker}" == "portainer_agent" ]); then - SDCHK=skip elif [[ ${tmp[@]} =~ ${docker} ]]; then if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NODETYPE}]}* ]]; then SDCHK=false @@ -852,7 +850,7 @@ STATUS_NODE(){ elif [ "${SDCHK}" == "skip" ]; then echo -e "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Host Disabled${idsCL[Default]}" else - echo -e "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled - Secondary Node${idsCL[Default]}" + echo -e "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled - Backup Node${idsCL[Default]}" fi done fi