Mercurial > repos > other > Puppet
changeset 427:3744cd0807cb
Move PHP socket to /run/
My assumptions in f354100b688a were wrong and CentOS _will_
sometimes clean up /run, so we can't use sub-directories
and altering the script is too much trouble when it assumes the
dir will exist because its default one is packaged in the RPM
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sat, 15 Oct 2022 15:38:08 +0100 |
| parents | 1d6cf5d981be |
| children | 7798ec0fd059 |
| files | modules/website/files/conf.extra/html-php.conf modules/website/files/php-fpm-www.conf modules/website/files/php.conf modules/website/manifests/php.pp |
| diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/modules/website/files/conf.extra/html-php.conf Fri Oct 14 19:18:57 2022 +0100 +++ b/modules/website/files/conf.extra/html-php.conf Sat Oct 15 15:38:08 2022 +0100 @@ -10,5 +10,5 @@ RewriteCond %{REQUEST_FILENAME} !-f RewriteRule . /error.php [L] - SetHandler "proxy:unix:/run/php/php-fpm.sock|fcgi://localhost/" + SetHandler "proxy:unix:/run/php-fpm.sock|fcgi://localhost/" </FilesMatch>
--- a/modules/website/files/php-fpm-www.conf Fri Oct 14 19:18:57 2022 +0100 +++ b/modules/website/files/php-fpm-www.conf Sat Oct 15 15:38:08 2022 +0100 @@ -35,7 +35,7 @@ ; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /run/php/php-fpm.sock +listen = /run/php-fpm.sock ; Set listen(2) backlog. ; Default Value: 511
--- a/modules/website/files/php.conf Fri Oct 14 19:18:57 2022 +0100 +++ b/modules/website/files/php.conf Sat Oct 15 15:38:08 2022 +0100 @@ -11,5 +11,5 @@ RewriteCond %{REQUEST_FILENAME} !-f RewriteRule . /error.php [L] - SetHandler "proxy:unix:/run/php/php-fpm.sock|fcgi://localhost/" + SetHandler "proxy:unix:/run/php-fpm.sock|fcgi://localhost/" </FilesMatch>
--- a/modules/website/manifests/php.pp Fri Oct 14 19:18:57 2022 +0100 +++ b/modules/website/manifests/php.pp Sat Oct 15 15:38:08 2022 +0100 @@ -23,7 +23,7 @@ fpm_service_ensure => 'running', fpm_pools => { 'www' => { - 'listen' => '/run/php/php-fpm.sock', + 'listen' => '/run/php-fpm.sock', 'listen_owner' => $::apache::params::user, 'listen_group' => $::apache::params::group, 'slowlog' => '/var/log/php-fpm/www-slow.log',