[packages/php/PHP_5_2] use /usr/sbin/php-fpm as other branches
glen
glen at pld-linux.org
Thu Aug 2 01:04:32 CEST 2012
commit ab81aa161060a8607b118e50f2049789e1baee41
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Aug 2 01:42:47 2012 +0300
use /usr/sbin/php-fpm as other branches
php-fpm.init | 8 ++++----
php.spec | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/php-fpm.init b/php-fpm.init
index ee84590..bb664a4 100644
--- a/php-fpm.init
+++ b/php-fpm.init
@@ -6,7 +6,7 @@
#
# description: PHP FastCGI Process Manager
#
-# processname: php.fpm
+# processname: php-fpm
# config: /etc/php/fpm.conf
# pidfile: /var/run/php/fpm.pid
#
@@ -28,7 +28,7 @@ start() {
fi
msg_starting "PHP FastCGI Process Manager"
- daemon --pidfile $pidfile /usr/sbin/php.fpm --fpm-config /etc/php/php-fpm.conf
+ daemon --pidfile $pidfile /usr/sbin/php-fpm --fpm-config /etc/php/php-fpm.conf
RETVAL=$?
[ $RETVAL -eq 0 ] && touch $lockfile
}
@@ -57,7 +57,7 @@ reload() {
fi
msg_reloading "PHP FastCGI Process Manager"
- killproc --pidfile $pidfile php.fpm -$sig
+ killproc --pidfile $pidfile php-fpm -$sig
RETVAL=$?
}
@@ -95,7 +95,7 @@ case "$1" in
reload USR1 0
;;
status)
- status php-fpm php.fpm
+ status php-fpm
RETVAL=$?
;;
*)
diff --git a/php.spec b/php.spec
index 75dfda5..4d621a4 100644
--- a/php.spec
+++ b/php.spec
@@ -2452,7 +2452,7 @@ libtool --silent --mode=install install sapi/fcgi/php-cgi $RPM_BUILD_ROOT%{_bind
# install FCGI PM
%if %{with fpm}
-libtool --silent --mode=install install sapi/fpm/php-cgi $RPM_BUILD_ROOT%{_bindir}/php.fpm
+libtool --silent --mode=install install sapi/fpm/php-cgi $RPM_BUILD_ROOT%{_sbindir}/php.fpm
%{__make} install-fpm -f Makefile.fpm \
INSTALL_ROOT=$RPM_BUILD_ROOT
install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/php-fpm
@@ -2736,7 +2736,7 @@ fi
%files fpm
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fpm.conf
-%attr(755,root,root) %{_bindir}/php.fpm
+%attr(755,root,root) %{_sbindir}/php-fpm
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/php-fpm
%attr(754,root,root) /etc/rc.d/init.d/php-fpm
%endif
More information about the pld-cvs-commit
mailing list