Merge pull request hestiacp#261 from Lupul/bugfix0427

Bugfix0427

Author: ScIT-Raphael

bin/v-add-letsencrypt-domain

@@ -166,7 +166,7 @@ for auth in $authz; do
         check_result $? "DNS _acme-challenge record wasn't created"
     else
         if [ -z "$mail" ]; then
-            if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then
+            if [ "$WEB_SYSTEM" = 'nginx' ] && [ ! -z "$PROXY_SYSTEM" ]; then
                 if [ ! -z "$mail" ]; then
                     conf="$HOMEDIR/$user/conf/mail/$root_domain/$PROXY_SYSTEM.conf_letsencrypt"
                     sconf="$HOMEDIR/$user/conf/mail/$root_domain/$PROXY_SYSTEM.ssl.conf_letsencrypt"

bin/v-add-web-domain-alias

@@ -34,8 +34,12 @@ format_aliases
 #                    Verifications                         #
 #----------------------------------------------------------#
 
+if [ -z "$aliases" ]; then
+    check_result $E_INVALID "invalid alias format: empty"
+fi
+
 check_args '3' "$#" 'USER DOMAIN ALIASES [RESTART]'
-is_format_valid 'user' 'domain' 'dom_alias'
+is_format_valid 'user' 'domain' 'aliases'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"

bin/v-delete-webmail

@@ -8,16 +8,16 @@
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 
-# Includes
-source $HESTIA/func/main.sh
-source $HESTIA/func/domain.sh
-source $HESTIA/conf/hestia.conf
-
 # Argument definition
 user=$1
 domain=$2
 restart="$3"
 
+# Includes
+source $HESTIA/func/main.sh
+source $HESTIA/func/domain.sh
+source $HESTIA/conf/hestia.conf
+
 # Additional argument formatting
 format_domain
 format_domain_idn

install/deb/multiphp/nginx/PHP-56.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php5.6-fpm-$2.sock
 listen.owner = $1
-listen.group = $1
+listen.group = www-data
 listen.mode = 0660
 
 user = $1

install/deb/multiphp/nginx/PHP-70.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.0-fpm-$2.sock
 listen.owner = $1
-listen.group = $1
+listen.group = www-data
 listen.mode = 0660
 
 user = $1

install/deb/multiphp/nginx/PHP-71.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.1-fpm-$2.sock
 listen.owner = $1
-listen.group = $1
+listen.group = www-data
 listen.mode = 0660
 
 user = $1

install/deb/multiphp/nginx/PHP-72.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.2-fpm-$2.sock
 listen.owner = $1
-listen.group = $1
+listen.group = www-data
 listen.mode = 0660
 
 user = $1

install/deb/multiphp/nginx/PHP-73.sh

@@ -10,7 +10,7 @@ pool_conf="[$2]
 
 listen = /run/php/php7.3-fpm-$2.sock
 listen.owner = $1
-listen.group = $1
+listen.group = www-data
 listen.mode = 0660
 
 user = $1