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 ee7427b8e712faac20152aa65ef639477c02731d..03a9a7bac3bb3b4dcb937e17d3231fb71fc09dcf 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -14,7 +14,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 b44f905e4bcab06df5f81de15962f1aff7fcf997..020fc7896fd9a1fc0af7bb4413aebe2401affbc3 100644 (file)
--- a/php-fpm.init
+++ b/php-fpm.init
@@ -8,7 +8,7 @@
 #
 # processname: @processname@
 # config:      /etc/php/php-fpm.conf
-# pidfile:     /var/run/php/@processname@.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