From d9d6f514aaab9fb3e3c33cb3c54df7c7929dc973 Mon Sep 17 00:00:00 2001
From: Dario Ernst <dario@kanojo.de>
Date: Sat, 26 Jan 2019 19:15:46 +0100
Subject: [PATCH] Catch webmail-url empty but webmail configured and force to
 default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Quite some users managed to delete the contents of the webmail-url field in
setup, which forces front into a restart loop. Catch the case where a webmail
service is configured, but url is empty — and force to default /webmail.

closes #856
---
 setup/flavors/compose/mailu.env | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 5ccd8ace..a23a2c4b 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -116,7 +116,11 @@ WEBROOT_REDIRECT=/webmail
 WEB_ADMIN={{ admin_path }}
 
 # Path to the webmail if enabled
+{% if webmail_type != 'none' and webmail_path == '' %}
+WEB_WEBMAIL=/webmail
+{% else %}
 WEB_WEBMAIL={{ webmail_path }}
+{% endif %}
 
 # Website name
 SITENAME={{ site_name }}