From 9091ea2cf05e392b77792d7c902e579e4f9669ca Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 23 Jul 2023 17:31:34 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/services.inc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index 7fe7674b..f9b82097 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.10.26-07202023' +VERS='4.10.28-07202023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/services.inc b/inc/services.inc index 772cab14..a762e5f0 100755 --- a/inc/services.inc +++ b/inc/services.inc @@ -38,13 +38,13 @@ SINGLE_SERVER_SERVICE_CHECK(){ for docker in "${!dockerstocheck}"; do for nip in "${!hosts}"; do if [[ "${local_ip}" = *"${nip}"* ]]; then - [ "${docker}" == "authelia" ] && [ ! "$(/usr/bin/docker ps -q -f name=${docker}_redis)" ] && /usr/bin/docker start ${docker}_redis & >/dev/null 2>&1 + [ "${docker}" == "authelia" ] && [ ! "$(/usr/bin/docker ps -q -f name=${docker}_redis)" ] && /usr/bin/docker start ${docker}_redis && sleep 2s >/dev/null 2>&1 [ ! "$(/usr/bin/docker ps -q -f name=${docker})" ] && /usr/bin/docker start ${docker} & >/dev/null 2>&1 # [ ! "$(/usr/bin/docker ps -q -f name=${docker})" ] && echo "starting local" || echo "already started local" else if [ "$(CHECK_HOST ${nip})" != "false" ]; then - [ "$(ssh root@${nip} /usr/bin/docker ps -q -f name=${docker})" ] && ssh root@${nip} /usr/bin/docker stop ${docker} & >/dev/null 2>&1 - [ "${docker}" == "authelia" ] && [ "$(ssh root@${nip} /usr/bin/docker ps -q -f name=${docker}_redis)" ] && ssh root@${nip} /usr/bin/docker stop ${docker}_redis & >/dev/null 2>&1 + [ "$(ssh root@${nip} /usr/bin/docker ps -q -f name=${docker})" ] && ssh root@${nip} /usr/bin/docker stop ${docker} >/dev/null 2>&1 + [ "${docker}" == "authelia" ] && [ "$(ssh root@${nip} /usr/bin/docker ps -q -f name=${docker}_redis)" ] && ssh root@${nip} /usr/bin/docker stop ${docker}_redis >/dev/null 2>&1 # [ "$(ssh root@${nip} /usr/bin/docker ps -q -f name=${docker})" ] && echo "stopping on $nip" || echo "already stopped on $nip" fi fi