Merge 07c960ed64 into 9c69a4e906

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 }}:

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'),