Merge branch 'master' into dev-0730

Author: Lupul

CHANGELOG.md

@@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file.
 - v-generate-api-key: Fixed wrong quotes used for default keys folder location.
 - Fixed permissions to allow access for FTP users created in web domains under admin account.
 - Removed obsolete Vesta Filemanager files completely.
+- Check if user home exists before set permission on sftp jail.
 
 ## [1.0.4] - 2019-07-09 - Hotfix
 ### Bugfixes

bin/v-add-user-sftp-jail

@@ -56,7 +56,9 @@ users=$(IFS=',';echo "${users[*]// /|}";IFS=$' \t\n')
 sed -i "s/$ssh_users/$users/g" /etc/ssh/sshd_config
 
 # Set home folder permission to root
-chown root:root /home/$user
+if [ -d "/home/$user" ]; then
+    chown root:root /home/$user
+fi
 
 #----------------------------------------------------------#
 #                       Hestia                             #

bin/v-open-fs-config

@@ -12,6 +12,12 @@ if [ -z "$src_file" ]; then
     exit 1
 fi
 
+# Checking hestia user
+if [ ! -d "$HESTIA/data/users/$user" ]; then
+    echo "Error: hestia user $user doesn't exist"
+    exit 3
+fi
+
 # Checking file on fs
 if [ ! -e "$src_file" ]; then
     echo "Error: $src_file file doesn't exist"