Jaap Marcus 1 год назад
Родитель
Сommit
8c41d00a6d

+ 1 - 1
install/deb/apache2/hestia-event.conf

@@ -1,5 +1,5 @@
 <IfModule mpm_event_module>
     <FilesMatch \.php$>
-        SetHandler "proxy:fcgi://127.0.0.1:9000"
+         SetHandler "proxy:unix:/run/php/www.sock|fcgi://localhost"
     </FilesMatch>
 </IfModule>

+ 4 - 5
install/deb/nginx/phpmyadmin.inc

@@ -16,12 +16,11 @@ location /%pma_alias% {
 		include       /etc/nginx/fastcgi_params;
 		fastcgi_index index.php;
 		fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
-		fastcgi_param SCRIPT_FILENAME $request_filename;
-		fastcgi_pass  127.0.0.1:9000;
+		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+		fastcgi_pass  unix:/run/php/www.sock;
 	}
 
-	# Serve static files like CSS and JS
-	location ~ ^/%pma_alias%/(.*\.(jpg|jpeg|gif|css|png|webp|js|ico|html|xml|txt))$ {
-		alias /usr/share/phpmyadmin/$1; # Corrected from root to alias
+	location /%pma_alias%/(.+\.(jpg|jpeg|gif|css|png|webp|js|ico|html|xml|txt))$ {
+		root /usr/share/phpmyadmin/;
 	}
 }

+ 11 - 9
install/deb/php-fpm/dummy.conf

@@ -1,16 +1,18 @@
-; origin-src: deb/php-fpm/dummy.conf
+; origin-src: deb/templates/web/php-fpm/default.tpl
+;#=========================================================================#
+;# Default Web Domain Template                                             #
+;# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
+;# https://hestiacp.com/docs/server-administration/web-templates.html      #
+;#=========================================================================#
 
-[wwww]
-listen = /run/php/php%backend_version%-fpm.dummy.sock
+
+
+[www]
+listen = /run/php/php%backend_version%-fpm-%domain%.sock
 listen.owner = hestiamail
-listen.group = hestiamail
+listen.group = www-data
 listen.mode = 0660
 
-;"hestiamail" user created to prevent users from abusing this config
 user = hestiamail
 group = hestiamail
 
-pm = ondemand
-pm.max_children = 4
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s

+ 7 - 5
install/deb/php-fpm/www.conf

@@ -1,12 +1,14 @@
-; origin-src: deb/php-fpm/www.conf
+; origin-src: deb/php-fpm/dummy.conf
 
-[www]
-listen = /run/php/www.sock;
-listen.allowed_clients = 127.0.0.1
+[wwww]
+listen = /run/php/www.sock
+listen.owner = hestiamail
+listen.group = www-data
+listen.mode = 0660
 
 ;"hestiamail" user created to prevent users from abusing this config
 user = hestiamail
-group = hestiamail
+group = www-data
 
 pm = ondemand
 pm.max_children = 4

+ 1 - 1
install/deb/pma/apache.conf

@@ -8,7 +8,7 @@ Alias /%pma_alias% /usr/share/phpmyadmin
     <IfModule mpm_event_module>
         # Use www.conf instead
         <FilesMatch \.php$>
-            SetHandler "proxy:fcgi://127.0.0.1:9000"
+             SetHandler "proxy:unix:/run/php/www.sock|fcgi://localhost"
         </FilesMatch>
     </IfModule>
 </Directory>