From ad8acefb96451820ed0534fffade5e80728f5012 Mon Sep 17 00:00:00 2001 From: andryyy Date: Tue, 14 Jul 2020 13:13:32 +0200 Subject: [PATCH] [SOGo] Disable EAS when SKIP_SOGO=y --- data/conf/nginx/templates/sogo_eas.template | 1 - docker-compose.yml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 data/conf/nginx/templates/sogo_eas.template diff --git a/data/conf/nginx/templates/sogo_eas.template b/data/conf/nginx/templates/sogo_eas.template deleted file mode 100644 index 3cea9f98..00000000 --- a/data/conf/nginx/templates/sogo_eas.template +++ /dev/null @@ -1 +0,0 @@ -proxy_pass http://${IPV4_NETWORK}.248:20000/SOGo/Microsoft-Server-ActiveSync; diff --git a/docker-compose.yml b/docker-compose.yml index 88f7053e..f2bf7a9b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -308,9 +308,9 @@ services: envsubst < /etc/nginx/conf.d/templates/listen_ssl.template > /etc/nginx/conf.d/listen_ssl.active && envsubst < /etc/nginx/conf.d/templates/server_name.template > /etc/nginx/conf.d/server_name.active && envsubst < /etc/nginx/conf.d/templates/sogo.template > /etc/nginx/conf.d/sogo.active && - envsubst < /etc/nginx/conf.d/templates/sogo_eas.template > /etc/nginx/conf.d/sogo_eas.active && . /etc/nginx/conf.d/templates/sogo.auth_request.template.sh > /etc/nginx/conf.d/sogo_proxy_auth.active && . /etc/nginx/conf.d/templates/sites.template.sh > /etc/nginx/conf.d/sites.active && + . /etc/nginx/conf.d/templates/sogo_eas.template.sh > /etc/nginx/conf.d/sogo_eas.active && nginx -qt && until ping phpfpm -c1 > /dev/null; do sleep 1; done && until ping sogo -c1 > /dev/null; do sleep 1; done && @@ -323,6 +323,7 @@ services: - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME} - IPV4_NETWORK=${IPV4_NETWORK:-172.22.1} - TZ=${TZ} + - SKIP_SOGO=${SKIP_SOGO:-n} - ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n} volumes: - ./data/web:/web:ro