Fix includes after 2550 (hestiacp#2722)

wojsmol · web-flow · commit 3ecd2f11164c · 2022-07-05T13:40:40.000+02:00
* Fix includes after 2550

* Add upgrade script
diff --git a/install/deb/templates/mail/nginx/default_disabled.stpl b/install/deb/templates/mail/nginx/default_disabled.stpl
@@ -21,5 +21,5 @@ server {
 
     proxy_hide_header Upgrade;
     
-    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
+    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;
 }
diff --git a/install/deb/templates/mail/nginx/default_disabled.tpl b/install/deb/templates/mail/nginx/default_disabled.tpl
@@ -16,6 +16,6 @@ include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*;
         proxy_pass  http://%ip%:%web_port%;
     }
     
-include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;
+    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
 
 }
diff --git a/install/upgrade/versions/1.6.3.sh b/install/upgrade/versions/1.6.3.sh
@@ -17,7 +17,7 @@
 
 upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'no'
 upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'no'
-upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'no'
-upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'yes'
+upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'yes'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
 

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ server {`
`21`	`21`
`22`	`22`	`proxy_hide_header Upgrade;`
`23`	`23`
`24`		`- include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;`
	`24`	`+ include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*;`
`16`	`16`	`proxy_pass http://%ip%:%web_port%;`
`17`	`17`	`}`
`18`	`18`
`19`		`-include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;`
	`19`	`+ include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;`
`20`	`20`
`21`	`21`	`}`