Merge branch 'master' into 'fix-localpart-chars'

2018-12-21 14:25:19 +01:00
parent c041a9d45c 9249b4a2d4
commit 6cfb74e96c
2 changed files with 3 additions and 4 deletions
--- 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 }} {