From ee5a2c46565e1b3f5ecfa89a2670d67897c2fc1b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 26 Aug 2012 14:46:15 +0300 Subject: [PATCH] get pidfile path from config Conflicts: php-fpm.init --- php-fpm.init | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/php-fpm.init b/php-fpm.init index f7c4fa6..b44f905 100644 --- 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=$? ;; *) -- 2.44.0