From 24828615cf5cec6f0fa13cae588685b4ef9e7ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Wed, 19 Dec 2018 16:20:24 +0200 Subject: [PATCH] Webmail on root, fixes #757 --- core/nginx/conf/nginx.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf index 5dc4e274..c90f7806 100644 --- a/core/nginx/conf/nginx.conf +++ b/core/nginx/conf/nginx.conf @@ -87,14 +87,15 @@ http { include /overrides/*.conf; # Actual logic - + {% if WEB_WEBMAIL != '/' %} location / { - {% if WEBROOT_REDIRECT and WEB_WEBMAIL != '/' %} + {% if WEBROOT_REDIRECT %} return 301 {{ WEBROOT_REDIRECT }}; {% else %} return 404; {% endif %} } + {% endif %} {% if WEBMAIL != 'none' %} location {{ WEB_WEBMAIL }} {