From d9493dbd32e101ba3aed12885192386680b50a28 Mon Sep 17 00:00:00 2001 From: Sergio Cambra Date: Mon, 3 Feb 2020 14:10:47 +0100 Subject: [PATCH 1/2] fix(fpm/config.sls): Fix pidfile to match PIDFile in systemd service Systemd services from packages.sury.org/php repository have PIDFile in /run/php directory, and latest package 7.4.2-5 has ExecStartPost which fails with timeout if PIDFile is not found. --- php/fpm/config.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/fpm/config.sls b/php/fpm/config.sls index e7574eaa..3c3471d5 100644 --- a/php/fpm/config.sls +++ b/php/fpm/config.sls @@ -26,7 +26,7 @@ {%- do conf_settings.update({key: value.replace(first_version, version)}) %} {%- endif %} {%- endfor %} - {%- do conf_settings.global.update({'pid': '/var/run/php' + version + '-fpm.pid' }) %} + {%- do conf_settings.global.update({'pid': '/run/php/php' + version + '-fpm.pid' }) %} {%- do conf_settings.global.update({'error_log': '/var/log/php' + version + '-fpm.log' }) %} php_fpm_ini_config_{{ version }}: From 07c960ed64282ba0dd647937c33365eb42718856 Mon Sep 17 00:00:00 2001 From: Sergio Cambra Date: Mon, 3 Feb 2020 14:23:00 +0100 Subject: [PATCH 2/2] fix(map.jinja): Fix pidfile to match PIDFile in systemd service For Debian with latest packages from packages.sury.org/php repository, when only one version is installed --- php/map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/map.jinja b/php/map.jinja index 516659d9..cd972332 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -2417,7 +2417,7 @@ 'group': 'root', 'defaults': odict([ ('global', odict([ - ('pid', '/var/run/php' + php_version + '-fpm.pid'), + ('pid', '/run/php/php' + php_version + '-fpm.pid'), ('error_log', '/var/log/php' + php_version + '-fpm.log'), ])), ('include', confdir + '/fpm/pool.d/*.conf'),