Mercurial > repos > other > Puppet

changeset 400:f354100b688a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch to Ubuntu-standard PHP FPM socket dir Ubuntu puts /tmp and /run on tmpfs, which gets wiped each reboot. While these directories *can* be nuked, they aren't on other platforms. Using the old paths, Puppet had to recreate the directory each boot. Using the new paths, Ubuntu handles creation within the systemd config. CentOS should just create once, migrate and work.
author IBBoard <dev@ibboard.co.uk>
date Wed, 20 Apr 2022 19:11:39 +0100
parents 2c6065b5be5e
children f0ee7a16125d
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	Wed Apr 20 19:08:14 2022 +0100
+++ b/modules/website/files/conf.extra/html-php.conf	Wed Apr 20 19:11:39 2022 +0100
@@ -10,5 +10,5 @@
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteRule . /error.php [L]
 
-	SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost/"
+	SetHandler "proxy:unix:/run/php/php-fpm.sock|fcgi://localhost/"
 </FilesMatch>
--- a/modules/website/files/php-fpm-www.conf	Wed Apr 20 19:08:14 2022 +0100
+++ b/modules/website/files/php-fpm-www.conf	Wed Apr 20 19:11:39 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-fpm/www.sock
+listen = /run/php/php-fpm.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511
--- a/modules/website/files/php.conf	Wed Apr 20 19:08:14 2022 +0100
+++ b/modules/website/files/php.conf	Wed Apr 20 19:11:39 2022 +0100
@@ -11,5 +11,5 @@
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteRule . /error.php [L]
 
-	SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost/"
+	SetHandler "proxy:unix:/run/php/php-fpm.sock|fcgi://localhost/"
 </FilesMatch>
--- a/modules/website/manifests/php.pp	Wed Apr 20 19:08:14 2022 +0100
+++ b/modules/website/manifests/php.pp	Wed Apr 20 19:11:39 2022 +0100
@@ -20,9 +20,9 @@
     fpm => true,
     fpm_pools => {
       'www' => {
-        'listen' => '/run/php-fpm/www.sock',
         'listen_owner' => $listener_user,
         'listen_group' => $listener_group,
+        'listen' => '/run/php/php-fpm.sock',
         'slowlog' => '/var/log/php-fpm/www-slow.log',
         'security_limit_extensions' => ['.php', '.html'],
         'php_admin_value' => {