Browse Source

Update template to support LE (#2550)

Rebuild mail templates is required
Jaap Marcus 3 years ago
parent
commit
5202dea365

+ 2 - 1
install/deb/templates/mail/nginx/default_disabled.stpl

@@ -20,5 +20,6 @@ server {
     }
 
     proxy_hide_header Upgrade;
-
+    
+    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
 }

+ 3 - 0
install/deb/templates/mail/nginx/default_disabled.tpl

@@ -15,4 +15,7 @@ include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*;
     location / {
         proxy_pass  http://%ip%:%web_port%;
     }
+    
+include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;
+
 }

+ 3 - 3
install/upgrade/versions/1.6.0.sh

@@ -15,9 +15,9 @@
 ####### You can use \n within the string to create new lines.                   #######
 #######################################################################################
 
-upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'false'
-upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'false'
-upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'false'
+upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'yes'
+upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'yes'
+upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'yes'
 upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'true'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'