From 38911034c3858d3dd55c46673c010fb06f1e4d29 Mon Sep 17 00:00:00 2001 From: andryyy Date: Tue, 26 Feb 2019 22:13:37 +0100 Subject: [PATCH] Don't break DAV --- data/conf/nginx/site.conf | 17 ++++++++++++++++- docker-compose.yml | 9 +++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/data/conf/nginx/site.conf b/data/conf/nginx/site.conf index c19310ae..a5dc0222 100644 --- a/data/conf/nginx/site.conf +++ b/data/conf/nginx/site.conf @@ -176,7 +176,22 @@ server { } location ^~ /SOGo { - include /etc/nginx/conf.d/sogo.active; + include /etc/nginx/conf.d/sogo_main.active; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header x-webobjects-server-protocol HTTP/1.0; + proxy_set_header x-webobjects-remote-host $remote_addr; + proxy_set_header x-webobjects-server-name $server_name; + proxy_set_header x-webobjects-server-url $client_req_scheme://$http_host; + proxy_set_header x-webobjects-server-port $server_port; + client_body_buffer_size 128k; + client_max_body_size 0; + break; + } + + location ^~ /SOGo/dav { + include /etc/nginx/conf.d/sogo_dav.active; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; diff --git a/docker-compose.yml b/docker-compose.yml index 4d4b9022..724c5c6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -141,7 +141,7 @@ services: - phpfpm sogo-mailcow: - image: mailcow/sogo:1.53 + image: mailcow/sogo:1.54 build: ./data/Dockerfiles/sogo environment: - DBNAME=${DBNAME} @@ -168,7 +168,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.64 + image: mailcow/dovecot:1.65 build: ./data/Dockerfiles/dovecot cap_add: - NET_BIND_SERVICE @@ -268,8 +268,9 @@ services: command: /bin/sh -c "envsubst < /etc/nginx/conf.d/templates/listen_plain.template > /etc/nginx/conf.d/listen_plain.active && 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 && - . /etc/nginx/conf.d/templates/sogo.auth_request.template.sh > /etc/nginx/conf.d/sogo.active && - envsubst < /etc/nginx/conf.d/templates/sogo.template >> /etc/nginx/conf.d/sogo.active && + . /etc/nginx/conf.d/templates/sogo.auth_request.template.sh > /etc/nginx/conf.d/sogo_main.active && + envsubst < /etc/nginx/conf.d/templates/sogo.template >> /etc/nginx/conf.d/sogo_main.active && + envsubst < /etc/nginx/conf.d/templates/sogo.template >> /etc/nginx/conf.d/sogo_dav.active && envsubst < /etc/nginx/conf.d/templates/sogo_eas.template > /etc/nginx/conf.d/sogo_eas.active && nginx -qt && until ping phpfpm -c1 > /dev/null; do sleep 1; done &&