From aace12f63f78c45ddd1eb1aa92ae4943269eefb8 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sat, 12 Oct 2013 18:32:07 +0300 Subject: [PATCH] Fix for additional accounts on Ubuntu and Debian --- bin/v-add-web-domain-ftp | 11 +++++------ func/rebuild.sh | 11 +++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index e416ab911..d33780071 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -52,7 +52,7 @@ if [ ! -z "$check_ftp_user" ] && [ "$FTP_USER" != "$ftp_user" ]; then fi if [ ! -z "$FTP_USER" ]; then - /usr/sbin/userdel -f $FTP_USER + /usr/sbin/userdel -f $FTP_USER > /dev/null 2>&1 fi # Define shell @@ -62,12 +62,11 @@ if [ -e "/usr/bin/rssh" ]; then fi # Adding user -/usr/sbin/adduser -o -u $(id -u $user) \ - -g $user \ +/usr/sbin/useradd $ftp_user \ -s $shell \ - -M -d "$HOMEDIR/$user/web/$domain" \ - $ftp_user > /dev/null 2>&1 - + -o -u $(id -u $user) \ + -g $user \ + -M -d "$HOMEDIR/$user/web/$domain" > /dev/null 2>&1 echo "$ftp_user:$ftp_password" | /usr/sbin/chpasswd ftp_md5="$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)" diff --git a/func/rebuild.sh b/func/rebuild.sh index e0227a45b..68e1f18cc 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -322,8 +322,15 @@ rebuild_web_domain_conf() { # Checking ftp if [ ! -z "$FTP_USER" ]; then if [ -z "$(grep ^$FTP_USER: /etc/passwd)" ]; then - /usr/sbin/adduser -o -u $(id -u $user) -g $user -s /sbin/nologin \ - -M -d "$HOMEDIR/$user/web/$domain" $FTP_USER > /dev/null 2>&1 + shell='/sbin/nologin' + if [ -e "/usr/bin/rssh" ]; then + shell='/usr/bin/rssh' + fi + /usr/sbin/useradd $FTP_USER \ + -s $shell \ + -o -u $(id -u $user) \ + -g $user \ + -M -d "$HOMEDIR/$user/web/$domain" > /dev/null 2>&1 # Update password shadow=$(grep "^$FTP_USER:" /etc/shadow)