From ecf14d24811ce43698075fa4e6f411b460bffe8d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 11 Dec 2023 09:23:28 -0600 Subject: [PATCH] Update services.inc --- inc/services.inc | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/inc/services.inc b/inc/services.inc index e3133870..98936bc4 100755 --- a/inc/services.inc +++ b/inc/services.inc @@ -46,22 +46,16 @@ SINGLE_SERVER_SERVICE_CHECK(){ if [ "docker ps -a | grep ${docker})" ]; then [ "${docker}" == "authelia" ] && [ ! "$(/usr/bin/docker ps -q -f name=auth_redis)" ] && /usr/bin/docker start auth_redis && sleep 2s >/dev/null 2>&1 [ ! "$(/usr/bin/docker ps -q -f name=${docker})" ] && /usr/bin/docker start ${docker} & >/dev/null 2>&1 - elif [ "${NM_DOCKER_COMPOSE_LOC[${docker}]}" != "" ]; then - /usr/local/bin/docker compose -f ${NM_DOCKER_COMPOSE_LOC[${docker}]}/docker-compose.yml up -d >/dev/null 2>&1 - echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is not found, creating and starting now" >> ${NM_LOGFILE} + # elif [ "${NM_DOCKER_COMPOSE_LOC[${docker}]}" != "" ]; then + # /usr/local/bin/docker compose -f ${NM_DOCKER_COMPOSE_LOC[${docker}]}/docker-compose.yml up -d >/dev/null 2>&1 + # echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is not found, creating and starting now" >> ${NM_LOGFILE} fi else if [ "$(CHECK_HOST ${nip})" != "false" ]; then - if [ "$(ssh root@${nip} docker ps -a | grep ${docker})" ]; 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=auth_redis)" ] && ssh root@${nip} /usr/bin/docker stop auth_redis >/dev/null 2>&1 - elif [ "${NM_DOCKER_COMPOSE_LOC[${docker}]}" != "" ]; then - ssh root@${nip} /usr/local/bin/docker compose -f ${NM_DOCKER_COMPOSE_LOC[${docker}]}/docker-compose.yml up -d >/dev/null 2>&1 - echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is not found, creating and starting now" >> ${NM_LOGFILE} - fi - + [ "$(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=auth_redis)" ] && ssh root@${nip} /usr/bin/docker stop auth_redis >/dev/null 2>&1 fi fi done