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.init b/php-fpm.init
index 3006f7e2a6f11100560b4d6387dd7fc5ced69769..6cc104acf01af43b71479a04a71aaac67480c2e9 100644 (file)
--- a/php-fpm.init
+++ b/php-fpm.init
@@ -8,7 +8,7 @@
 #
 # processname: @processname@
 # config:      /etc/php/fpm.conf
-# pidfile:     /var/run/php/@processname@.pid
+# pidfile:     /var/run/@processname@.pid
 #
 
 # Source function library
@@ -20,7 +20,7 @@
 configfile=/etc/php/fpm.conf
 lockfile=/var/lock/subsys/@processname@
 pidfile=$(sed -ne  's,.*"\?pid_file"\?>\([^<]\+\)<.*,\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 3bec7c1a11e7ba613b5ee84c267fc667c5a03dc8..b192547775397aeac21a39a54fe0f583bf04ee09 100644 (file)
--- a/php-fpm.logrotate
+++ b/php-fpm.logrotate
@@ -1,5 +1,5 @@
-/var/log/fpm.log
-/var/log/fpm-slow.log
+/var/log/php/@processname@.log
+/var/log/php/@processname@-slow.log
 {
        notifempty
        missingok