Don't run v-add-user-jail for every user during rebuild

Author: jaapmarcus

bin/v-add-user-ssh-jail

@@ -51,6 +51,11 @@ if [ -d "/home/$user" ]; then
 	chown root:root /home/$user
 fi
 
+user_str=$(grep "^$user:" /etc/passwd | egrep "rssh|nologin")
+if [ -n "$user_str" ]; then
+	exit
+fi
+
 add_chroot_jail "$user"
 
 # Add user to the ssh-jailed group to allow jailed ssh

func/rebuild.sh

@@ -126,8 +126,9 @@ rebuild_user_conf() {
 	chown root:root $HOMEDIR/$user/conf
 
 	$BIN/v-add-user-sftp-jail "$user"
-
-	$BIN/v-add-user-ssh-jail "$user"
+	if [ "$SHELL_JAIL_ENABLED" == "yes" ]; then
+		$BIN/v-add-user-ssh-jail "$user"
+	fi
 
 	# Update disk pipe
 	sed -i "/ $user$/d" $HESTIA/data/queue/disk.pipe