From e9c63b2db059f17facaa820d3b636d9cf3337367 Mon Sep 17 00:00:00 2001 From: Matthew Frost Date: Fri, 18 Mar 2016 20:26:09 +0100 Subject: [PATCH] reorded nginx conf --- conf/nginx.conf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 465ebe5..c5785d7 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,14 +1,4 @@ - # Add below lines for SOGo - # SOGo - location ~ ^/sogo { rewrite ^ https://$host/SOGo; } - location ~ ^/SOGO { rewrite ^ https://$host/SOGo; } - - # For IOS 7 - location = /principals/ { - rewrite ^ https://$server_name/SOGo/dav; - allow all; - } - + # SOGo Proxying location ^~ /SOGo { proxy_pass http://127.0.0.1:20000; proxy_redirect http://127.0.0.1:20000/SOGo/ /SOGo; @@ -22,6 +12,16 @@ proxy_set_header x-webobjects-server-url $scheme://$host; include conf.d/yunohost_panel.conf.inc; } + # SOGo + location ~ ^/sogo { rewrite ^ https://$host/SOGo; } + location ~ ^/SOGO { rewrite ^ https://$host/SOGo; } + + # For IOS 7 + location = /principals/ { + rewrite ^ https://$server_name/SOGo/dav; + allow all; + } + location /SOGo.woa/WebServerResources/ { alias /usr/lib/GNUstep/SOGo/WebServerResources/;