浏览代码

Fix empty conf error message in pool directory for multiphp.

Raphael Schneeberger 7 年之前
父节点
当前提交
c64c0e1754
共有 3 个文件被更改,包括 14 次插入0 次删除
  1. 2 0
      install/hst-install-debian.sh
  2. 2 0
      install/hst-install-ubuntu.sh
  3. 10 0
      install/upgrade/0.9.8-29.sh

+ 2 - 0
install/hst-install-debian.sh

@@ -1083,6 +1083,8 @@ if [ "$nginx" = 'yes' ]; then
             rm -f /etc/php/$v/fpm/pool.d/*
             v_tpl=$(echo "$v" | sed -e 's/[.]//')
             cp -f $hestiacp/multiphp/nginx/PHP-$v_tpl.* $HESTIA/data/templates/web/nginx/
+            cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$v/fpm/pool.d/
+            sed -i "/s/9999/9999$v_tpl/g" /etc/php/$v/fpm/pool.d/dummy.conf
         done
         cp -f $hestiacp/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/
         chmod a+x $HESTIA/data/templates/web/nginx/*.sh

+ 2 - 0
install/hst-install-ubuntu.sh

@@ -1062,6 +1062,8 @@ if [ "$nginx" = 'yes' ]; then
             rm -f /etc/php/$v/fpm/pool.d/*
             v_tpl=$(echo "$v" | sed -e 's/[.]//')
             cp -f $hestiacp/multiphp/nginx/PHP-$v_tpl.* $HESTIA/data/templates/web/nginx/
+            cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$v/fpm/pool.d/
+            sed -i "/s/9999/9999$v_tpl/g" /etc/php/$v/fpm/pool.d/dummy.conf
         done
         cp -f $hestiacp/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/
         chmod a+x $HESTIA/data/templates/web/nginx/*.sh

+ 10 - 0
install/upgrade/0.9.8-29.sh

@@ -124,6 +124,16 @@ if [ "$PROXY_SYSTEM" = "nginx" ]; then
     fi
 fi
 
+# Fix empty pool error message for multiphp
+php_versions=$( ls -l /etc/php/ | grep ^d | wc -l )
+if [ "$php_versions" -gt 1 ]; then
+    for v in $(ls /etc/php/); do
+        cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$d/fpm/pool.d/
+        v=$(echo "$v" | sed -e 's/[.]//')
+        sed -i "/s/9999/9999$v/g" /etc/php/$v/fpm/pool.d/dummy.conf
+    done
+fi
+
 # Set Purge to false in roundcube config - https://goo.gl/3Nja3u
 echo "(*) Updating Roundcube configuration..."
 if [ -f /etc/roundcube/config.inc.php ]; then