Просмотр исходного кода

Fix(#4979): Fixes domain redirects not being suspended (#4991)

* Fixed suspended templates so redirects don't work

* Fixed suspended templates so redirects don't work

* Update 1.9.4.sh

---------

Co-authored-by: Christoph Schläpfer <c.schlaepfer@datact.ch>
Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
Christoph Schlaepfer 9 месяцев назад
Родитель
Сommit
f8c8a9aed0

+ 1 - 1
install/deb/templates/web/nginx/suspended.stpl

@@ -41,5 +41,5 @@ server {
 		alias %home%/%user%/web/%domain%/document_errors/;
 	}
 
-	include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
+	include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_lets*;
 }

+ 2 - 1
install/deb/templates/web/nginx/suspended.tpl

@@ -32,5 +32,6 @@ server {
 		alias %home%/%user%/web/%domain%/document_errors/;
 	}
 
-	include %home%/%user%/conf/web/%domain%/nginx.conf_*;
+	include %home%/%user%/conf/web/%domain%/nginx.conf_lets*;
+
 }

+ 1 - 1
install/upgrade/versions/1.9.4.sh

@@ -17,7 +17,7 @@
 ####### 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_WEB_TEMPLATES' 'true'
 upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'false'
 upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'false'
 upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'