From 08973962c667753e0d6cf5d88bcd8e9c01225f99 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 23 May 2023 22:21:01 -0500 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 9155651c..813c011d 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -730,6 +730,7 @@ SINGLE_SERVER_SERVICE_CHECK(){ if [ "${1}" = "web" ]; then # servicestocheck=gitea,pdnsadmin servicestocheck=gitea + dockerstocheck=( heimdall vaultwarden ) IFS=,; services_to_check=(${servicestocheck}); unset IFS local_ips=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1); @@ -756,14 +757,18 @@ SINGLE_SERVER_SERVICE_CHECK(){ /bin/systemctl start ${stc} & fi done - for nip in "${WEB_HOSTS[@]}"; do - if [[ "${local_ip}" != *"${nip}"* ]]; then - ssh root@${nip} /usr/bin/docker stop vaultwarden heimdall >/dev/null 2>&1 - fi + for docker in "${dockerstocheck[@]}"; do + for nip in "${WEB_HOSTS[@]}"; do + if [[ "${local_ip}" = *"${nip}"* ]]; then + [ ! "$(/usr/bin/docker ps -q -f name=${docker})" ] && /usr/bin/docker start ${docker} & >/dev/null 2>&1 + else + ssh root@${nip} [ "$(/usr/bin/docker ps -q -f name=${docker})" ] && /usr/bin/docker stop ${docker} & >/dev/null 2>&1 + fi + done done - /usr/bin/docker start vaultwarden heimdall & >/dev/null 2>&1 fi + else for stc in "${services_to_check[@]}"; do [ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.socket pdnsadmin.service"