From 2007b0ffc914a94015ebf79402e296a7f711c877 Mon Sep 17 00:00:00 2001 From: andryyy Date: Wed, 29 Apr 2020 21:08:52 +0200 Subject: [PATCH] [SOGo] Fix skipped SOGo --- data/Dockerfiles/sogo/bootstrap-sogo.sh | 6 ------ data/Dockerfiles/sogo/docker-entrypoint.sh | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/Dockerfiles/sogo/bootstrap-sogo.sh b/data/Dockerfiles/sogo/bootstrap-sogo.sh index 612a4e00..443b836e 100755 --- a/data/Dockerfiles/sogo/bootstrap-sogo.sh +++ b/data/Dockerfiles/sogo/bootstrap-sogo.sh @@ -258,10 +258,4 @@ else rm /etc/cron.d/sogo fi -if [[ "${SKIP_SOGO}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then - echo "SKIP_SOGO=y, skipping SOGo..." - sleep 365d - exit 0 -fi - exec gosu sogo /usr/sbin/sogod diff --git a/data/Dockerfiles/sogo/docker-entrypoint.sh b/data/Dockerfiles/sogo/docker-entrypoint.sh index ffa64d2c..ce28c34f 100755 --- a/data/Dockerfiles/sogo/docker-entrypoint.sh +++ b/data/Dockerfiles/sogo/docker-entrypoint.sh @@ -1,5 +1,11 @@ #!/bin/bash +if [[ "${SKIP_SOGO}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then + echo "SKIP_SOGO=y, skipping SOGo..." + sleep 365d + exit 0 +fi + if [[ ! -z ${REDIS_SLAVEOF_IP} ]]; then cp /etc/syslog-ng/syslog-ng-redis_slave.conf /etc/syslog-ng/syslog-ng.conf fi