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

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 }} {

setup/flavors/compose/mailu.env

@@ -93,13 +93,11 @@ RECIPIENT_DELIMITER={{ recipient_delimiter or '+' }}
 DMARC_RUA={{ dmarc_rua or 'admin' }}
 DMARC_RUF={{ dmarc_ruf or 'admin' }}
 
-{% if welcome_enabled %}
 # Welcome email, enable and set a topic and body if you wish to send welcome
 # emails to all users.
 WELCOME={{ welcome_enable or 'false' }}
 WELCOME_SUBJECT={{ welcome_subject or 'Welcome to your new email account' }}
 WELCOME_BODY={{ welcome_body or 'Welcome to your new email account, if you can read this, then it is configured properly!' }}
-{% endif %}
 
 # Maildir Compression
 # choose compression-method, default: none (value: bz2, gz)