diff --git a/plugins/php/conf/php-fpm-52.conf b/plugins/php/conf/php-fpm-52.conf index 6552b797e..444c2c816 100644 --- a/plugins/php/conf/php-fpm-52.conf +++ b/plugins/php/conf/php-fpm-52.conf @@ -6,7 +6,7 @@
Pid file - /www/server/php/52/var/log/php-fpm.pid + /www/server/php/52/var/run/php-fpm.pid Error log file /www/server/php/52/var/log/php-fpm.log diff --git a/plugins/php/index.py b/plugins/php/index.py index 010114d3e..e6ee08b24 100755 --- a/plugins/php/index.py +++ b/plugins/php/index.py @@ -228,10 +228,6 @@ def initReplace(version): file_bin = initD_path + '/php' + version if not os.path.exists(file_bin): file_tpl = getPluginDir() + '/init.d/php.tpl' - - if version == '52': - file_tpl = getPluginDir() + '/init.d/php52.tpl' - content = mw.readFile(file_tpl) content = contentReplace(content, version) diff --git a/plugins/php/init.d/php52.tpl b/plugins/php/init.d/php52.tpl deleted file mode 100644 index 49b94dba4..000000000 --- a/plugins/php/init.d/php52.tpl +++ /dev/null @@ -1,139 +0,0 @@ -#! /bin/sh - -php_fpm_BIN=/www/server/php/52/bin/php-cgi -php_fpm_CONF=/www/server/php/52/etc/php-fpm.conf -php_fpm_PID=/www/server/php/52//var/log/php-fpm.pid - - -php_opts="--fpm-config $php_fpm_CONF" - - -wait_for_pid () { - try=0 - - while test $try -lt 35 ; do - - case "$1" in - 'created') - if [ -f "$2" ] ; then - try='' - break - fi - ;; - - 'removed') - if [ ! -f "$2" ] ; then - try='' - break - fi - ;; - esac - - echo -n . - try=`expr $try + 1` - sleep 1 - - done - -} - -case "$1" in - start) - echo -n "Starting php_fpm " - - $php_fpm_BIN --fpm $php_opts - - if [ "$?" != 0 ] ; then - echo " failed" - exit 1 - fi - - wait_for_pid created $php_fpm_PID - - if [ -n "$try" ] ; then - echo " failed" - exit 1 - else - echo " done" - fi - ;; - - stop) - echo -n "Shutting down php_fpm " - - if [ ! -r $php_fpm_PID ] ; then - echo "warning, no pid file found - php-fpm is not running ?" - exit 1 - fi - - kill -TERM `cat $php_fpm_PID` - - wait_for_pid removed $php_fpm_PID - - if [ -n "$try" ] ; then - echo " failed" - exit 1 - else - echo " done" - fi - ;; - - quit) - echo -n "Gracefully shutting down php_fpm " - - if [ ! -r $php_fpm_PID ] ; then - echo "warning, no pid file found - php-fpm is not running ?" - exit 1 - fi - - kill -QUIT `cat $php_fpm_PID` - - wait_for_pid removed $php_fpm_PID - - if [ -n "$try" ] ; then - echo " failed" - exit 1 - else - echo " done" - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - - echo -n "Reload service php-fpm " - - if [ ! -r $php_fpm_PID ] ; then - echo "warning, no pid file found - php-fpm is not running ?" - exit 1 - fi - - kill -USR2 `cat $php_fpm_PID` - - echo " done" - ;; - - logrotate) - - echo -n "Re-opening php-fpm log file " - - if [ ! -r $php_fpm_PID ] ; then - echo "warning, no pid file found - php-fpm is not running ?" - exit 1 - fi - - kill -USR1 `cat $php_fpm_PID` - - echo " done" - ;; - - *) - echo "Usage: $0 {start|stop|quit|restart|reload|logrotate}" - exit 1 - ;; - -esac diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index 30378f0c4..fb957937e 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -161,8 +161,10 @@ if [ ! -d $serverPath/php/${PHP_VER}/lib/php/extensions/no-debug-non-zts-2006061 mkdir -p $serverPath/php/${PHP_VER}/lib/php/extensions/no-debug-non-zts-20060613 fi - +# ps -ef|grep php/52 |grep -v grep |awk '{print $2}'|xargs kill +# /www/server/php/init.d/php52 start mkdir -p $serverPath/php/${PHP_VER}/var/log +mkdir -p $serverPath/php/${PHP_VER}/var/run #------------------------ install end ------------------------------------# }