- restart php-fpm if installed

Changed files:
    rpm.macros -> 1.518

diff --git a/rpm.macros b/rpm.macros
index 892397962c3205dd00626203b0be8122589cdc7d..c728e36fb1544f23e3736712877866c2a46baea1 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -740,19 +740,22 @@ fi; \
 %php_webserver_restart \
 [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart \
 [ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart \
-if [ -f /etc/rc.d/init.d/php-fcgi ]; then \
+if [ -x /etc/rc.d/init.d/php-fcgi ]; then \
        PHP_FCGI_BINARY=; . /etc/sysconfig/php-fcgi 2>/dev/null \
        if [[ ${PHP_FCGI_BINARY:-php.fcgi} = *php.fcgi* ]]; then \
                %service -q php-fcgi restart \
        fi \
 fi \
+if [ -x /etc/rc.d/init.d/php-fpm ]; then \
+       %service -q php-fpm restart \
+fi \
 %{nil}
 
 # for using php post scripts. for PHP >= 4.0 && PHP < 5.0
 %php4_webserver_restart \
 [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart \
 [ ! -f /etc/httpd/conf.d/??_mod_php4.conf ] || %service -q httpd restart \
-if [ -f /etc/rc.d/init.d/php-fcgi ]; then \
+if [ -x /etc/rc.d/init.d/php-fcgi ]; then \
        PHP_FCGI_BINARY=; . /etc/sysconfig/php-fcgi 2>/dev/null \
        if [[ ${PHP_FCGI_BINARY:-php.fcgi} = *php4.fcgi* ]]; then \
                %service -q php-fcgi restart \