Sync branch with main development branch

Author: Kristan Kenney

install/deb/php-fpm/dummy.conf

@@ -0,0 +1,11 @@
+[www]
+listen = 127.0.0.1:9999
+listen.allowed_clients = 127.0.0.1
+
+user = www-data
+group = www-data
+
+pm = ondemand
+pm.max_children = 2
+pm.max_requests = 4000
+pm.process_idle_timeout = 10s

install/hst-install-debian.sh

@@ -1102,6 +1102,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

install/hst-install-ubuntu.sh

@@ -1075,6 +1075,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

install/upgrade/0.9.8-29.sh

@@ -202,6 +202,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/
+        v1=$(echo "$v" | sed -e 's/[.]//')
+        sed -i "s/9999/9999$v1/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

src/hst_autocompile.sh

@@ -21,10 +21,10 @@ timestamp() {
 }
 
 # Install needed software
-echo "Update system repository..."
-apt-get -qq update
+echo "Updating system APT repositories..."
+apt-get -qq update > /dev/null 2>&1
 echo "Installing dependencies for compilation..."
-apt-get -qq install -y $SOFTWARE
+apt-get -qq install -y $SOFTWARE > /dev/null 2>&1
 
 # Fix for Debian PHP Envroiment
 if [ ! -e /usr/local/include/curl ]; then
@@ -314,7 +314,7 @@ fi
 #################################################################################
 
 if [ "$INSTALL" = 'y' ] || [ "$INSTALL" = 'Y'  ]; then
-    for i in ~/*hestia*.deb; do
+    for i in $BUILD_DIR/*hestia*.deb; do
       # Install all available packages
       dpkg -i $i
     done