use /var/run for fpm pid files

currently /var/run/php is cleaned up by php session cleanup script
which cleans up everything in that dir, not only php session files

so as consequence this removes php-fpm pidfiles and service restart
remains confused what to stop.

php-wsdl cache files get nuked by the same problem, so those could be
moved to /var/cache/php, so they could survive reboots

probably it's wrong to have /var/run/php as php-session storage (note
the generic namem it's not /var/run/php/sessions etc), but changing that
would need more efforts, as need to support old and new configuration,
and each php sapi could have different config (they have different
php.ini (or equivalent) files)

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 093f3816070785463294aede41d3815e03106d54..19aa0a50b5defb4818101ef903307fba5ed45d2f 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -19,7 +19,7 @@
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
  ; Default Value: none
 -;pid = run/php-fpm.pid
-+pid = /var/run/php/@processname@.pid
++pid = /var/run/@processname@.pid
  
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written

diff --git a/php-fpm.init b/php-fpm.init
index 142250ead3a09f2af469f45bcb74998572cca629..125922be2c5d652452f96586ecfdf1c2a0657243 100644 (file)
--- a/php-fpm.init
+++ b/php-fpm.init
@@ -8,7 +8,7 @@
 #
 # processname: php-fpm
 # config:      /etc/php/php-fpm.conf
-# pidfile:     /var/run/php/fpm.pid
+# pidfile:     /var/run/@processname@.pid
 #
 
 # Source function library
@@ -20,7 +20,7 @@
 configfile=/etc/php/php-fpm.conf
 lockfile=/var/lock/subsys/@processname@
 pidfile=$(sed -ne  's,^pid\s*=\s*\(.*\),\1,p' $configfile)
-pidfile=${pidfile:-/var/run/php/@processname@.pid}
+pidfile=${pidfile:-/var/run/@processname@.pid}
 
 start() {
        # Check if the service is already running?

diff --git a/php-fpm.logrotate b/php-fpm.logrotate
index 694b2312606e0056fdc7b6b7ece568f88d6069f1..24172c6c7f9690b55cec533180638816a649ebbe 100644 (file)
--- a/php-fpm.logrotate
+++ b/php-fpm.logrotate
@@ -1,4 +1,4 @@
-/var/log/@processname@.log
+/var/log/php/@processname@.log
 {
        notifempty
        missingok