Remove port 9000 sockets and change over to unix sockets

jaapmarcus · jaapmarcus · commit 2bc116445fd5 · 2025-01-30T14:56:18.000+01:00
diff --git a/install/deb/php-fpm/dummy.conf b/install/deb/php-fpm/dummy.conf
@@ -3,12 +3,12 @@
 [wwww]
 listen = /run/php/php%backend_version%-fpm.dummy.sock
 listen.owner = hestiamail
-listen.group = www-data
+listen.group = hestiamail
 listen.mode = 0660
 
 ;"hestiamail" user created to prevent users from abusing this config
 user = hestiamail
-group = www-data
+group = hestiamail
 
 pm = ondemand
 pm.max_children = 4
diff --git a/install/deb/php-fpm/www.conf b/install/deb/php-fpm/www.conf
@@ -1,12 +1,12 @@
 ; origin-src: deb/php-fpm/www.conf
 
 [www]
-listen = 127.0.0.1:9000
+listen = /run/php/www.sock;
 listen.allowed_clients = 127.0.0.1
 
 ;"hestiamail" user created to prevent users from abusing this config
 user = hestiamail
-group = www-data
+group = hestiamail
 
 pm = ondemand
 pm.max_children = 4
diff --git a/install/deb/templates/mail/nginx/snappymail.stpl b/install/deb/templates/mail/nginx/snappymail.stpl
@@ -43,9 +43,9 @@ server {
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
-			fastcgi_param SCRIPT_FILENAME $request_filename;
+			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 
-			fastcgi_pass  127.0.0.1:9000;
+			fastcgi_pass unix:/run/php/www.sock;
 		}
 	}
 
diff --git a/install/deb/templates/mail/nginx/snappymail.tpl b/install/deb/templates/mail/nginx/snappymail.tpl
@@ -35,9 +35,9 @@ server {
 			include /etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
-			fastcgi_param SCRIPT_FILENAME $request_filename;
+			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 
-			fastcgi_pass  127.0.0.1:9000;
+			fastcgi_pass unix:/run/php/www.sock;
 		}
 	}
 
diff --git a/install/deb/templates/mail/nginx/web_system.stpl b/install/deb/templates/mail/nginx/web_system.stpl
@@ -38,9 +38,9 @@ server {
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
-			fastcgi_param SCRIPT_FILENAME $request_filename;
+			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 
-			fastcgi_pass  127.0.0.1:9000;
+			fastcgi_pass unix:/run/php/www.sock;
 		}
 	}
 
diff --git a/install/deb/templates/mail/nginx/web_system.tpl b/install/deb/templates/mail/nginx/web_system.tpl
@@ -30,9 +30,9 @@ server {
 			include /etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
-			fastcgi_param SCRIPT_FILENAME $request_filename;
+			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 
-			fastcgi_pass  127.0.0.1:9000;
+			fastcgi_pass unix:/run/php/www.sock;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ server {`
`43`	`43`
`44`	`44`	`fastcgi_index index.php;`
`45`	`45`	`fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;`
`46`		`- fastcgi_param SCRIPT_FILENAME $request_filename;`
	`46`	`+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;`
`47`	`47`
`48`		`- fastcgi_pass 127.0.0.1:9000;`
	`48`	`+ fastcgi_pass unix:/run/php/www.sock;`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ server {`
`35`	`35`	`include /etc/nginx/fastcgi_params;`
`36`	`36`
`37`	`37`	`fastcgi_index index.php;`
`38`		`- fastcgi_param SCRIPT_FILENAME $request_filename;`
	`38`	`+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;`
`39`	`39`
`40`		`- fastcgi_pass 127.0.0.1:9000;`
	`40`	`+ fastcgi_pass unix:/run/php/www.sock;`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ server {`
`38`	`38`
`39`	`39`	`fastcgi_index index.php;`
`40`	`40`	`fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;`
`41`		`- fastcgi_param SCRIPT_FILENAME $request_filename;`
	`41`	`+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;`
`42`	`42`
`43`		`- fastcgi_pass 127.0.0.1:9000;`
	`43`	`+ fastcgi_pass unix:/run/php/www.sock;`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ server {`
`30`	`30`	`include /etc/nginx/fastcgi_params;`
`31`	`31`
`32`	`32`	`fastcgi_index index.php;`
`33`		`- fastcgi_param SCRIPT_FILENAME $request_filename;`
	`33`	`+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;`
`34`	`34`
`35`		`- fastcgi_pass 127.0.0.1:9000;`
	`35`	`+ fastcgi_pass unix:/run/php/www.sock;`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`