Merge branch 'main' into staging/1.4.6

CHANGELOG.md

@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - Explicitly disable cron reports #1978 
 - Fixed an issue where in rare cases certificate failed to install @dpeca and @myvesta
 - Fixed an issue where composer failed to install when .composer folder is missing
+- Fix #1980 Lets Encrypt Auto Renewal Reverts Webmail Client back to Roundcube
 
 ## [1.4.5] - Service release
 

bin/v-add-mail-domain-ssl

@@ -78,15 +78,32 @@ fi
 # Call routine to add SSL configuration to mail domain
 add_mail_ssl_config
 
-# Add webmail configuration to mail domain
-WEBMAIL_TEMPLATE="default"
-if [ "$WEB_SYSTEM" = "nginx" ]; then
-    WEBMAIL_TEMPLATE="web_system"
+if [ "$webmail" == "roundcube" ]; then
+    WEBMAIL_TEMPLATE="default"
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        PROXY_TEMPLATE="default"
+    fi
+    # Add webmail configuration to mail domain
+    WEBMAIL_TEMPLATE="default"
+    if [ "$WEB_SYSTEM" = "nginx" ]; then
+        WEBMAIL_TEMPLATE="web_system"
+    fi
+elif [ "$webmail" == "rainloop" ]; then
+    WEBMAIL_TEMPLATE="rainloop"
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        PROXY_TEMPLATE="default_rainloop"
+    fi
+else
+    WEBMAIL_TEMPLATE="disabled"
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        PROXY_TEMPLATE="default_disabled"
+    fi
 fi
+
 add_webmail_config "$WEB_SYSTEM" "${WEBMAIL_TEMPLATE}.stpl"
 
 if [ ! -z "$PROXY_SYSTEM" ]; then
-    add_webmail_config "$PROXY_SYSTEM" "default.stpl"
+    add_webmail_config "$PROXY_SYSTEM" "${PROXY_TEMPLATE}.stpl"
 fi
 
 # Increase value for domain