Release 0.9.8-28

Author: ScIT-Raphael

ISSUE_TEMPLATE.md

@@ -13,7 +13,7 @@ Type here (e.g. A list of hosted web domains should appear).
 Type here (e.g. Ubuntu 18.04 LTS)
 
 ### HestiaCP Version:
-Type here (e.g. 0.9.8-27)
+Type here (e.g. 0.9.8-28)
 
 ### What software is installed?
 Type here (e.g. Apache, Nginx, PHP-FPM, Dovecot/Exim, MariaDB, etc.)

bin/v-change-web-domain-backend-tpl

@@ -48,7 +48,7 @@ is_backend_template_valid $template
 prepare_web_backend
 
 # Deleting backend
-rm -f $pool/$backend_type.conf
+delete_web_backend
 
 # Allocating backend port
 backend_port=9000

bin/v-delete-web-domain-backend

@@ -63,7 +63,7 @@ if [ "$WEB_BACKEND_POOL" = 'user' ]; then
 fi
 
 # Deleting backend
-rm -f $pool/$backend_type.conf
+delete_web_backend
 
 
 #----------------------------------------------------------#

bin/v-rebuild-web-domains

@@ -62,11 +62,11 @@ fi
 if [ ! -z "$WEB_BACKEND" ]; then
     if [ "$WEB_BACKEND_POOL" = 'user' ]; then
         prepare_web_backend
-        rm -f $pool/$backend_type.conf
+        delete_web_backend
     else
         for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
             prepare_web_backend
-            rm -f $pool/$backend_type.conf
+            delete_web_backend
         done
     fi
 fi

bin/v-restart-web-backend

@@ -50,13 +50,15 @@ if [ -z "$WEB_BACKEND" ] || [ "$WEB_BACKEND" = 'remote' ]; then
 fi
 
 # Restart system
-php_fpm=$(ls /etc/init.d/php*-fpm 2>/dev/null |cut -f 4 -d / |head -n 1)
-if [ -z "$php_fpm" ]; then
-    service $WEB_BACKEND restart >/dev/null 2>&1
-else
-    service $php_fpm restart >/dev/null 2>&1
-fi
-
+php_fpm=$(ls /etc/init.d/php*-fpm* 2>/dev/null |cut -f 4 -d /)
+for back in $php_fpm
+do
+    if [ -z "$php_fpm" ]; then
+        service $WEB_BACKEND restart >/dev/null 2>&1
+    else
+        service $back restart >/dev/null 2>&1
+    fi
+done
 if [ $? -ne 0 ]; then
     send_email_report
     check_result $E_RESTART "$WEB_BACKEND restart failed"

bin/v-restore-user

@@ -690,6 +690,11 @@ if [ "$cron" != 'no' ] && [ ! -z "CRON_SYSTEM" ]; then
         echo -e "$(date "+%F %T") $jobs cron jobs"|tee -a $tmpdir/restore.log
     fi
 
+    # Replace paths from vesta to hestia
+    if [ "$backup_system" == 'vesta' ] && [ "$user" == 'admin' ]; then
+        sed -i 's/vesta/hestia/g' $tmpdir/cron/cron.conf
+    fi
+
     # Restoring cron jobs
     cp $tmpdir/cron/cron.conf $USER_DATA/cron.conf
 

bin/v-update-firewall

@@ -64,7 +64,7 @@ echo "$iptables -P INPUT ACCEPT" >> $tmp
 echo "$iptables -F INPUT" >> $tmp
 
 # Enabling stateful support
-if [ "$conntrack" != 'no' ]; then
+if [ "$conntrack" != 'no' ] || grep --quiet container=lxc /proc/1/environ; then
     str="$iptables -A INPUT -m state"
     str="$str --state ESTABLISHED,RELATED -j ACCEPT"
     echo "$str" >> $tmp

func/domain.sh

@@ -84,7 +84,22 @@ is_web_alias_new() {
 
 # Prepare web backend
 prepare_web_backend() {
-    pool=$(find -L /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
+    pool=$(find -L /etc/php/ -name "$domain.conf" -exec dirname {} \;)
+
+    # Check if multiple-PHP installed
+    regex="socket-(\d+)_(\d+)"
+    if [[ $template =~ ^socket-([0-9])\_([0-9])$ ]]
+    then
+        version="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
+        pool=$(find -L /etc/php/$version -type d \( -name "pool.d" -o -name "*fpm.d" \))
+    else
+        if [ "$pool" == "" ]
+        then
+            version=`echo "<?php echo (float)phpversion();" | php`
+            pool=$(find -L /etc/php/$version -type d \( -name "pool.d" -o -name "*fpm.d" \))
+        fi
+    fi
+ 
     if [ ! -e "$pool" ]; then
         check_result $E_NOTEXIST "php-fpm pool doesn't exist"
     fi
@@ -102,6 +117,11 @@ prepare_web_backend() {
     fi
 }
 
+# Delete web backend
+delete_web_backend() {
+    find -L /etc/php/ -type f -name "$backend_type.conf" -exec rm -f {} \;
+}
+
 # Prepare web aliases
 prepare_web_aliases() {
     i=1

install/hst-install-debian.sh

@@ -1662,8 +1662,9 @@ we hope that you enjoy it as much as we do!
 Please feel free to contact us at any time if you have any questions,
 or if you encounter any bugs or problems:
 
-E-mail:  info@hestiacp.com
+E-Mail:  info@hestiacp.com
 Web:     https://www.hestiacp.com/
+Forum:   https://www.hestiacp.com/
 GitHub:  https://www.github.com/hestiacp/hestiacp
 
 --

install/hst-install-ubuntu.sh

@@ -1576,8 +1576,9 @@ we hope that you enjoy it as much as we do!
 Please feel free to contact us at any time if you have any questions,
 or if you encounter any bugs or problems:
 
-E-mail:  info@hestiacp.com
+E-Mail:  info@hestiacp.com
 Web:     https://www.hestiacp.com/
+Forum:   https://www.hestiacp.com/
 GitHub:  https://www.github.com/hestiacp/hestiacp
 
 --