get pidfile path from config

Conflicts:
	php-fpm.init

diff --git a/php-fpm.init b/php-fpm.init
index f7c4fa606884920bd18871a6ebc8f38884553778..b44f905e4bcab06df5f81de15962f1aff7fcf997 100644 (file)
--- a/php-fpm.init
+++ b/php-fpm.init
@@ -17,8 +17,10 @@
 # Get network config
 . /etc/sysconfig/network
 
-pidfile=/var/run/php/@processname@.pid
+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}
 
 start() {
        # Check if the service is already running?
@@ -28,7 +30,7 @@ start() {
        fi
 
        msg_starting "PHP FastCGI Process Manager (@processname@)"
-       daemon --pidfile $pidfile /usr/sbin/@processname@ --fpm-config /etc/php/php-fpm.conf
+       daemon --pidfile $pidfile /usr/sbin/@processname@ --fpm-config $configfile
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch $lockfile
 }
@@ -95,7 +97,7 @@ case "$1" in
        reload USR1 0
        ;;
   status)
-       status @processname@
+       status  --pidfile $pidfile @processname@
        RETVAL=$?
        ;;
   *)