Fix: 421 error on all web and mail domains after Apache 2.4.64 update (hestiacp#5058)

sahsanu · web-flow · commit 262b7301a74a · 2025-07-14T09:36:25.000+02:00
* Fix: 421 error on all web and mail domains after Apache 2.4.64 update

* Modify 1.9.4.sh script to also update mail templates
diff --git a/install/deb/templates/mail/nginx/default.stpl b/install/deb/templates/mail/nginx/default.stpl
@@ -31,6 +31,8 @@ server {
 
 		try_files $uri $uri/ =404;
 
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 
 		location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
@@ -40,6 +42,8 @@ server {
 	}
 
 	location @fallback {
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 	}
 
diff --git a/install/deb/templates/mail/nginx/default_disabled.stpl b/install/deb/templates/mail/nginx/default_disabled.stpl
@@ -21,6 +21,8 @@ server {
 	}
 
 	location / {
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass http://%ip%:%web_port%;
 	}
 
diff --git a/install/deb/templates/mail/nginx/default_snappymail.stpl b/install/deb/templates/mail/nginx/default_snappymail.stpl
@@ -31,6 +31,8 @@ server {
 
 		try_files $uri $uri/ =404;
 
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 
 		location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
@@ -40,6 +42,8 @@ server {
 	}
 
 	location @fallback {
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 	}
 
diff --git a/install/deb/templates/web/nginx/caching.stpl b/install/deb/templates/web/nginx/caching.stpl
@@ -27,6 +27,8 @@ server {
 	}
 
 	location / {
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 
 		proxy_cache %domain%;
@@ -64,6 +66,8 @@ server {
 	}
 
 	location @fallback {
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 	}
 
diff --git a/install/deb/templates/web/nginx/default.stpl b/install/deb/templates/web/nginx/default.stpl
@@ -27,6 +27,8 @@ server {
 	}
 
 	location / {
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 
 		location ~* ^.+\.(%proxy_extensions%)$ {
@@ -41,6 +43,8 @@ server {
 	}
 
 	location @fallback {
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 	}
 
diff --git a/install/deb/templates/web/nginx/hosting.stpl b/install/deb/templates/web/nginx/hosting.stpl
@@ -27,6 +27,8 @@ server {
 	}
 
 	location / {
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 
 		location ~* ^.+\.(%proxy_extensions%)$ {
@@ -41,6 +43,8 @@ server {
 	}
 
 	location @fallback {
+		proxy_ssl_server_name on;
+		proxy_ssl_name $host;
 		proxy_pass https://%ip%:%web_ssl_port%;
 	}
 
diff --git a/install/upgrade/versions/1.9.4.sh b/install/upgrade/versions/1.9.4.sh
@@ -19,7 +19,7 @@
 
 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_UPDATE_MAIL_TEMPLATES' 'true'
 upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'true'
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ server {`
`31`	`31`
`32`	`32`	`try_files $uri $uri/ =404;`
`33`	`33`
	`34`	`+ proxy_ssl_server_name on;`
	`35`	`+ proxy_ssl_name $host;`
`34`	`36`	`proxy_pass https://%ip%:%web_ssl_port%;`
`35`	`37`
`36`	`38`	`location ~* ^.+\.(ogg\|ogv\|svg\|svgz\|swf\|eot\|otf\|woff\|woff2\|mov\|mp3\|mp4\|webm\|flv\|ttf\|rss\|atom\|jpg\|jpeg\|gif\|png\|webp\|ico\|bmp\|mid\|midi\|wav\|rtf\|css\|js\|jar)$ {`
`@@ -40,6 +42,8 @@ server {`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`location @fallback {`
	`45`	`+ proxy_ssl_server_name on;`
	`46`	`+ proxy_ssl_name $host;`
`43`	`47`	`proxy_pass https://%ip%:%web_ssl_port%;`
`44`	`48`	`}`
`45`	`49`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ server {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`location / {`
	`24`	`+ proxy_ssl_server_name on;`
	`25`	`+ proxy_ssl_name $host;`
`24`	`26`	`proxy_pass http://%ip%:%web_port%;`
`25`	`27`	`}`
`26`	`28`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ server {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`location / {`
	`30`	`+ proxy_ssl_server_name on;`
	`31`	`+ proxy_ssl_name $host;`
`30`	`32`	`proxy_pass https://%ip%:%web_ssl_port%;`
`31`	`33`
`32`	`34`	`proxy_cache %domain%;`
`@@ -64,6 +66,8 @@ server {`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`location @fallback {`
	`69`	`+ proxy_ssl_server_name on;`
	`70`	`+ proxy_ssl_name $host;`
`67`	`71`	`proxy_pass https://%ip%:%web_ssl_port%;`
`68`	`72`	`}`
`69`	`73`