diff --git a/defaults.inc b/defaults.inc index 5d367c92..80e96e78 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.3.26a-02282025' +VERS='5.3.26b-02282025' 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 79d0b653..61fd0d6c 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -694,8 +694,8 @@ STATUS_NODE(){ SDCHK=true if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then SDCHK=skip - # elif ([ "${nip}" == "10.2.1.5" ] && [ "${docker}" == "tinytuya-server" ]); 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 @@ -725,7 +725,7 @@ STATUS_NODE(){ if [ "${docker}" == "watchtower" ]; then ${NCMD} runup watchtower >/dev/null 2>&1 elif [ "${docker}" == "portainer_agent" ]; then - [ "${NM_HOSTNAMES[${nip}]}" != "ESPHome" ] && ${NCMD} docker run -d -p 9001:9001 --name portainer_agent --restart=always -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker/volumes:/var/lib/docker/volumes -v /:/host portainer/agent:2.27.1 >/dev/null 2>&1 + ${NCMD} docker run -d -p 9001:9001 --name portainer_agent --restart=always -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker/volumes:/var/lib/docker/volumes -v /:/host portainer/agent:2.27.1 >/dev/null 2>&1 else ${NCMD} docker compose -f ${NM_DOCKER_COMPOSE_LOC[${docker}]}/docker-compose.yml up -d >/dev/null 2>&1 fi