Merge pull request hestiacp#546 from Lupul/dev-0714

Multiphp improvements

Author: Lupul

bin/v-add-fs-archive

@@ -15,7 +15,7 @@ if [ -z "$src0" ]; then
 fi
 
 # Checking hestia user
-if [ ! -e "$HESTIA/data/users/$user" ]; then
+if [ ! -d "$HESTIA/data/users/$user" ]; then
     echo "Error: hestia user $user doesn't exist"
     exit 3
 fi

bin/v-add-fs-directory

@@ -14,7 +14,7 @@ if [ -z "$dst_dir" ]; then
 fi
 
 # Checking hestia user
-if [ ! -e "$HESTIA/data/users/$user" ]; then
+if [ ! -d "$HESTIA/data/users/$user" ]; then
     echo "Error: hestia user $user doesn't exist"
     exit 3
 fi

bin/v-add-fs-file

@@ -14,7 +14,7 @@ if [ -z "$dst_file" ]; then
 fi
 
 # Checking hestia user
-if [ ! -e "$HESTIA/data/users/$user" ]; then
+if [ ! -d "$HESTIA/data/users/$user" ]; then
     echo "Error: hestia user $user doesn't exist"
     exit 3
 fi

bin/v-add-sys-ip

@@ -81,6 +81,7 @@ if [ -z "$sys_ip_check" ]; then
         fi
         IFS='%'
         echo -e $sys_ip >> /etc/netplan/60-hestia.yaml
+        unset IFS
     else
         sys_ip="\n# Added by hestia"
         sys_ip="$sys_ip\nauto $iface"
@@ -178,8 +179,8 @@ fi
 increase_user_value "$user" '$IP_OWNED'
 if [ "$user" = 'admin' ]; then
     if [ "$ip_status" = 'shared' ]; then
-        for user in $(ls $HESTIA/data/users); do
-            increase_user_value "$user" '$IP_AVAIL'
+        for hestia_user in $($HESTIA/bin/v-list-sys-users plain); do
+            increase_user_value "$hestia_user" '$IP_AVAIL'
         done
     else
         increase_user_value 'admin' '$IP_AVAIL'

bin/v-add-sys-quota

@@ -75,7 +75,7 @@ else
 fi
 
 # Rebuilding user quota
-for user in $(ls $HESTIA/data/users); do
+for user in $($HESTIA/bin/v-list-sys-users plain); do
     $BIN/v-update-user-quota $user
 done
 

bin/v-add-user

@@ -68,7 +68,9 @@ if [ -z "$(grep ^hestia-users: /etc/group)" ]; then
 fi
 
 # Add membership to hestia-users group to non-admin users
-if [ "$user" != "admin" ]; then
+if [ "$user" = "admin" ]; then
+    setfacl -m "g:admin:r-x" "$HOMEDIR/$user"
+else
     usermod -a -G "hestia-users" "$user"
     setfacl -m "u:$user:r-x" "$HOMEDIR/$user"
 fi

bin/v-add-web-domain-backend

@@ -62,7 +62,8 @@ cat $WEBTPL/$WEB_BACKEND/$template.tpl |\
     sed -e "s|%backend_port%|$backend_port|" \
         -e "s|%user%|$user|g"\
         -e "s|%domain%|$domain|g"\
-        -e "s|%backend%|$backend_type|g" > $pool/$backend_type.conf
+        -e "s|%backend%|$backend_type|g"\
+        -e "s|%backend_version%|$backend_version|g" > $pool/$backend_type.conf
 
 
 #----------------------------------------------------------#

bin/v-add-web-php

@@ -33,7 +33,7 @@ if [[ ! $version =~ ^[0-9]\.[0-9]+ ]]; then
 fi
 
 # Check if php version already exists
-if [ -f "$php_fpm" ] && [ -f "$HESTIA/data/templates/$WEB_SYSTEM/PHP-$version.sh" ]; then
+if [ -f "$php_fpm" ] && [ -f "$HESTIA/data/templates/web/php-fpm/PHP-${version/\./_}.tpl" ]; then
     echo "Version already installed..."
     exit
 fi
@@ -51,13 +51,21 @@ fi
 mph="php$version-mbstring php$version-bcmath php$version-cli php$version-curl
      php$version-fpm php$version-gd php$version-intl php$version-mysql
      php$version-soap php$version-xml php$version-zip php$version-mbstring
-     php$version-json php$version-bz2 php$version-pspell"
+     php$version-json php$version-bz2 php$version-pspell php$version-imagick php$version-pgsql"
 
 # Check is version is 7.1 or below to add mcrypt
 if [[ `echo "$version 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
     mph="$mph php$version-mcrypt"
 fi
 
+if [ -z "$DB_SYSTEM" -o "$DB_SYSTEM" = "mysql" ]; then
+    mph=$(echo "$mph" | sed -e "s/php$version-pgsql//")
+fi
+
+if [ -z "$DB_SYSTEM" -o "$DB_SYSTEM" = "pgsql" ]; then
+    mph=$(echo "$mph" | sed -e "s/php$version-mysql//")
+fi
+
 # Install php packages
 apt-get -qq update
 apt-get -y install $mph > /dev/null 2>&1 &
@@ -83,42 +91,32 @@ fi
 
 # Check if required modules for apache2 are enabled
 if [ "$WEB_SYSTEM" = "apache2" ]; then
-    if ! ls -l /etc/apache2/mods-enabled/ | grep --quiet "proxy_fcgi"; then
-        a2enmod proxy_fcgi > /dev/null 2>&1
-        restart_apache2="yes"
-    fi
-    if ! ls -l /etc/apache2/mods-enabled/ | grep --quiet "setenvif"; then
-        a2enmod setenvif > /dev/null 2>&1
-        restart_apache2="yes"
+    if ! a2query -q -m proxy_fcgi; then
+        a2enmod -q proxy_fcgi
     fi
-    if [ "$restart_apache2" = "yes" ]; then
-        service apache2 restart > /dev/null 2>&1
+    if ! a2query -q -m setenvif; then
+        a2enmod -q setenvif
     fi
+    $BIN/v-restart-web
 fi
 
 # Configure fpm
 update-rc.d php$version-fpm defaults > /dev/null 2>&1
-v_tpl=$(echo "$version" | sed -e 's/[.]//')
+v_tpl=${version//.}
 rm -f /etc/php/$version/fpm/pool.d/*
 cp -f $HESTIA_INSTALL_DIR/php-fpm/dummy.conf /etc/php/$version/fpm/pool.d/
 sed -i "s/9999/99$v_tpl/g" /etc/php/$version/fpm/pool.d/dummy.conf
 
-# Install php templates
-cp -f $HESTIA_INSTALL_DIR/multiphp/$WEB_SYSTEM/PHP-${version//.}.sh \
-    $HESTIA/data/templates/web/$WEB_SYSTEM/
-cp -f $HESTIA_INSTALL_DIR/multiphp/$WEB_SYSTEM/PHP-${version//.}.tpl \
-    $HESTIA/data/templates/web/$WEB_SYSTEM/
-cp -f $HESTIA_INSTALL_DIR/multiphp/$WEB_SYSTEM/PHP-${version//.}.stpl \
-    $HESTIA/data/templates/web/$WEB_SYSTEM/
-chmod a+x $HESTIA/data/templates/web/$WEB_SYSTEM/PHP-${version//.}.sh
-
+# Install backend template
+cp -f $HESTIA_INSTALL_DIR/php-fpm/multiphp.tpl \
+    $HESTIA/data/templates/web/php-fpm/PHP-${version/\./_}.tpl
 
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
 
 # Logging
-log_history "installed php $job"
+log_history "installed php $version" '' 'admin'
 log_event "$OK" "$ARGUMENTS"
 
 exit

bin/v-backup-users

@@ -28,7 +28,7 @@ mysqlrepair --all-databases --check --auto-repair > /dev/null 2>&1
 if [ -z "$BACKUP_SYSTEM" ]; then
     exit
 fi
-for user in $(grep '@' /etc/passwd |cut -f1 -d:); do
+for user in $($HESTIA/bin/v-list-sys-users plain); do
     check_suspend=$(grep "SUSPENDED='no'" $HESTIA/data/users/$user/user.conf)
     log=$HESTIA/log/backup.log
     if [ ! -f "$HESTIA/data/users/$user/user.conf" ]; then

bin/v-change-database-owner

@@ -32,7 +32,7 @@ is_object_unsuspended 'user' 'USER' "$user"
 
 # Check owner existance
 owner=$(echo $database | cut -f 1 -d '_')
-if [ ! -e "$HESTIA/data/users/$owner" ]; then
+if [ ! -d "$HESTIA/data/users/$owner" ]; then
     echo "Error: database owner doesn't exist"
     log_event "$E_NOTEXIST" "$ARGUMENTS"
     exit $E_NOTEXIST