From 2cb4ea7c801d4bc921450adba11bda831d5a41bf Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 25 Nov 2023 13:54:35 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/services.inc | 6 +++--- inc/status.inc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/defaults.inc b/defaults.inc index a3e32faf..cfac25ec 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.15.23-11232023' +VERS='4.15.25-11232023' 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 ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/services.inc b/inc/services.inc index 2ab3335e..f35e9858 100755 --- a/inc/services.inc +++ b/inc/services.inc @@ -45,7 +45,7 @@ SINGLE_SERVER_SERVICE_CHECK(){ [ "${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 + /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 @@ -56,7 +56,7 @@ SINGLE_SERVER_SERVICE_CHECK(){ [ "$(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 + 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 @@ -503,7 +503,7 @@ CHECK_DOCKER_SERVICES(){ if [ "$(${NCMD} docker ps -aq -f status=exited -f name=${docker})" ]; then ${NCMD} docker rm ${docker} fi - ${NCMD} /usr/local/bin/docker compose -f ${NM_DOCKER_COMPOSE_LOC[${docker}]}/docker compose.yml up -d + ${NCMD} /usr/local/bin/docker compose -f ${NM_DOCKER_COMPOSE_LOC[${docker}]}/docker-compose.yml up -d sleep 10s if [ "$(${NCMD} docker ps -q -f name=${docker})" ]; then if [ "${ST_ACTION}" != "check" ]; then diff --git a/inc/status.inc b/inc/status.inc index df348cb1..d40fe371 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -385,7 +385,7 @@ STATUS(){ ${NCMD} docker start ${docker} >/dev/null 2>&1 echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is not running, starting now" >> ${NM_LOGFILE} else - ${NCMD} docker compose -f "${NM_DOCKER_COMPOSE_LOC[${docker}]}/docker compose.yml" up -d >/dev/null 2>&1 + ${NCMD} 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 sleep 10s