Update php-fpm.service

include/php-5.3.sh

@@ -152,9 +152,8 @@ Install_PHP53() {
   if [ ! -e "${apache_install_dir}/bin/apxs" -o "${Apache_flag}" == '24' ]; then
     # php-fpm Init Script
     if [ -e /bin/systemctl ]; then
-      /bin/cp sapi/fpm/php-fpm.service /lib/systemd/system/
-      sed -i "s@\${prefix}@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
-      sed -i "s@\${exec_prefix}@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
+      /bin/cp ${oneinstack_dir}/init.d/php-fpm.service /lib/systemd/system/
+      sed -i "s@/usr/local/php@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
       systemctl enable php-fpm
     else
       /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm

include/php-5.4.sh

@@ -147,9 +147,8 @@ Install_PHP54() {
   if [ ! -e "${apache_install_dir}/bin/apxs" -o "${Apache_flag}" == '24' ]; then
     # php-fpm Init Script
     if [ -e /bin/systemctl ]; then
-      /bin/cp sapi/fpm/php-fpm.service /lib/systemd/system/
-      sed -i "s@\${prefix}@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
-      sed -i "s@\${exec_prefix}@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
+      /bin/cp ${oneinstack_dir}/init.d/php-fpm.service /lib/systemd/system/
+      sed -i "s@/usr/local/php@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
       systemctl enable php-fpm
     else
       /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm

include/php-5.5.sh

@@ -160,9 +160,8 @@ EOF
   if [ ! -e "${apache_install_dir}/bin/apxs" -o "${Apache_flag}" == '24' ]; then
     # php-fpm Init Script
     if [ -e /bin/systemctl ]; then
-      /bin/cp sapi/fpm/php-fpm.service /lib/systemd/system/
-      sed -i "s@\${prefix}@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
-      sed -i "s@\${exec_prefix}@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
+      /bin/cp ${oneinstack_dir}/init.d/php-fpm.service /lib/systemd/system/
+      sed -i "s@/usr/local/php@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
       systemctl enable php-fpm
     else
       /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm

include/php-5.6.sh

@@ -163,9 +163,8 @@ EOF
   if [ ! -e "${apache_install_dir}/bin/apxs" -o "${Apache_flag}" == '24' ]; then
     # php-fpm Init Script
     if [ -e /bin/systemctl ]; then
-      /bin/cp sapi/fpm/php-fpm.service /lib/systemd/system/
-      sed -i "s@\${prefix}@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
-      sed -i "s@\${exec_prefix}@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
+      /bin/cp ${oneinstack_dir}/init.d/php-fpm.service /lib/systemd/system/
+      sed -i "s@/usr/local/php@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
       systemctl enable php-fpm
     else
       /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm

include/php-7.0.sh

@@ -169,7 +169,8 @@ EOF
   if [ ! -e "${apache_install_dir}/bin/apxs" -o "${Apache_flag}" == '24' ]; then
     # php-fpm Init Script
     if [ -e /bin/systemctl ]; then
-      /bin/cp sapi/fpm/php-fpm.service /lib/systemd/system/
+      /bin/cp ${oneinstack_dir}/init.d/php-fpm.service /lib/systemd/system/
+      sed -i "s@/usr/local/php@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
       systemctl enable php-fpm
     else
       /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm

include/php-7.1.sh

@@ -169,7 +169,8 @@ EOF
   if [ ! -e "${apache_install_dir}/bin/apxs" -o "${Apache_flag}" == '24' ]; then
     # php-fpm Init Script
     if [ -e /bin/systemctl ]; then
-      /bin/cp sapi/fpm/php-fpm.service /lib/systemd/system/
+      /bin/cp ${oneinstack_dir}/init.d/php-fpm.service /lib/systemd/system/
+      sed -i "s@/usr/local/php@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
       systemctl enable php-fpm
     else
       /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm

include/php-7.2.sh

@@ -162,7 +162,8 @@ EOF
   if [ ! -e "${apache_install_dir}/bin/apxs" -o "${Apache_flag}" == '24' ]; then
     # php-fpm Init Script
     if [ -e /bin/systemctl ]; then
-      /bin/cp sapi/fpm/php-fpm.service /lib/systemd/system/
+      /bin/cp ${oneinstack_dir}/init.d/php-fpm.service /lib/systemd/system/
+      sed -i "s@/usr/local/php@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
       systemctl enable php-fpm
     else
       /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm

include/php-7.3.sh

@@ -172,7 +172,8 @@ EOF
   if [ ! -e "${apache_install_dir}/bin/apxs" -o "${Apache_flag}" == '24' ]; then
     # php-fpm Init Script
     if [ -e /bin/systemctl ]; then
-      /bin/cp sapi/fpm/php-fpm.service /lib/systemd/system/
+      /bin/cp ${oneinstack_dir}/init.d/php-fpm.service /lib/systemd/system/
+      sed -i "s@/usr/local/php@${php_install_dir}@g" /lib/systemd/system/php-fpm.service
       systemctl enable php-fpm
     else
       /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm

include/upgrade_oneinstack.sh

@@ -39,6 +39,7 @@ Upgrade_OneinStack() {
       [ -n "`grep ^cgi.fix_pathinfo=0 ${php_install_dir}/etc/php.ini`" ] && sed -i 's@^cgi.fix_pathinfo.*@;&@' ${php_install_dir}/etc/php.ini
       [ -e "/usr/local/php53/etc/php.ini" ] && sed -i 's@^cgi.fix_pathinfo=0@;&@' /usr/local/php{53,54,55,56,70,71,72}/etc/php.ini 2>/dev/null
     fi
+    [ -e "/lib/systemd/system/php-fpm.service" ] && { sed -i 's@^PrivateTmp.*@#&@g' /lib/systemd/system/php-fpm.service; systemctl daemon-reload; }
     echo
     echo "${CSUCCESS}Congratulations! OneinStack upgrade successful! ${CEND}"
     echo

init.d/php-fpm.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=The PHP FastCGI Process Manager
+Documentation=http://php.net/docs.php
+After=network.target
+
+[Service]
+Type=simple
+PIDFile=/usr/local/php/var/run/php-fpm.pid
+ExecStart=/usr/local/php/sbin/php-fpm --nodaemonize --fpm-config /usr/local/php/etc/php-fpm.conf
+ExecReload=/bin/kill -USR2 $MAINPID
+LimitNOFILE=1000000
+LimitNPROC=1000000
+LimitCORE=1000000
+
+[Install]
+WantedBy=multi-user.target