Skip to content

Commit 8c41d00

Browse files
committed
Do the same for Apache2
1 parent 2bc1164 commit 8c41d00

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<IfModule mpm_event_module>
22
<FilesMatch \.php$>
3-
SetHandler "proxy:fcgi://127.0.0.1:9000"
3+
SetHandler "proxy:unix:/run/php/www.sock|fcgi://localhost"
44
</FilesMatch>
55
</IfModule>

install/deb/nginx/phpmyadmin.inc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ location /%pma_alias% {
1616
include /etc/nginx/fastcgi_params;
1717
fastcgi_index index.php;
1818
fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
19-
fastcgi_param SCRIPT_FILENAME $request_filename;
20-
fastcgi_pass 127.0.0.1:9000;
19+
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
20+
fastcgi_pass unix:/run/php/www.sock;
2121
}
2222

23-
# Serve static files like CSS and JS
24-
location ~ ^/%pma_alias%/(.*\.(jpg|jpeg|gif|css|png|webp|js|ico|html|xml|txt))$ {
25-
alias /usr/share/phpmyadmin/$1; # Corrected from root to alias
23+
location /%pma_alias%/(.+\.(jpg|jpeg|gif|css|png|webp|js|ico|html|xml|txt))$ {
24+
root /usr/share/phpmyadmin/;
2625
}
2726
}

install/deb/php-fpm/dummy.conf

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
; origin-src: deb/php-fpm/dummy.conf
1+
; origin-src: deb/templates/web/php-fpm/default.tpl
2+
;#=========================================================================#
3+
;# Default Web Domain Template #
4+
;# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS #
5+
;# https://hestiacp.com/docs/server-administration/web-templates.html #
6+
;#=========================================================================#
27

3-
[wwww]
4-
listen = /run/php/php%backend_version%-fpm.dummy.sock
8+
9+
10+
[www]
11+
listen = /run/php/php%backend_version%-fpm-%domain%.sock
512
listen.owner = hestiamail
6-
listen.group = hestiamail
13+
listen.group = www-data
714
listen.mode = 0660
815

9-
;"hestiamail" user created to prevent users from abusing this config
1016
user = hestiamail
1117
group = hestiamail
1218

13-
pm = ondemand
14-
pm.max_children = 4
15-
pm.max_requests = 4000
16-
pm.process_idle_timeout = 10s

install/deb/php-fpm/www.conf

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
; origin-src: deb/php-fpm/www.conf
1+
; origin-src: deb/php-fpm/dummy.conf
22

3-
[www]
4-
listen = /run/php/www.sock;
5-
listen.allowed_clients = 127.0.0.1
3+
[wwww]
4+
listen = /run/php/www.sock
5+
listen.owner = hestiamail
6+
listen.group = www-data
7+
listen.mode = 0660
68

79
;"hestiamail" user created to prevent users from abusing this config
810
user = hestiamail
9-
group = hestiamail
11+
group = www-data
1012

1113
pm = ondemand
1214
pm.max_children = 4

install/deb/pma/apache.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Alias /%pma_alias% /usr/share/phpmyadmin
88
<IfModule mpm_event_module>
99
# Use www.conf instead
1010
<FilesMatch \.php$>
11-
SetHandler "proxy:fcgi://127.0.0.1:9000"
11+
SetHandler "proxy:unix:/run/php/www.sock|fcgi://localhost"
1212
</FilesMatch>
1313
</IfModule>
1414
</Directory>

0 commit comments

Comments
 (0)