diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 5c273b22..67aa936c 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -56,8 +56,8 @@ if [ ! -z "$FTP_USER" ]; then fi # Adding user -/usr/sbin/adduser $ftp_user -g $user -s /sbin/nologin -M \ - -d "$HOMEDIR/$user/web/$domain" > /dev/null 2>&1 +/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 echo "$ftp_password" | /usr/bin/passwd "$ftp_user" --stdin &>/dev/null ftp_md5="$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)" diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index eed4d1dc..68c9f2ac 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -90,7 +90,7 @@ fi # Deleting ftp account if [ ! -z "$FTP_USER" ]; then - /usr/sbin/userdel $FTP_USER + /usr/sbin/userdel -f $FTP_USER >> /dev/null 2>&1 fi # Deleting directory diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp index ca71d31d..cfe9061d 100755 --- a/bin/v-delete-web-domain-ftp +++ b/bin/v-delete-web-domain-ftp @@ -38,9 +38,9 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$FTP_USER' # Action # #----------------------------------------------------------# -# Adding user +# Deleting ftp user get_domain_values 'web' -/usr/sbin/userdel $FTP_USER +/usr/sbin/userdel -f $FTP_USER >> /dev/null 2>&1 #----------------------------------------------------------# diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index 374af8a5..c8b6a9cc 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -219,8 +219,8 @@ for domain in $(shell_list) ; do # Checking ftp if [ ! -z "$FTP_USER" ]; then if [ -z "$(grep ^$FTP_USER: /etc/passwd)" ]; then - /usr/sbin/adduser $FTP_USER -g $user -s /sbin/nologin -M \ - -d "$HOMEDIR/$user/web/$domain" > /dev/null 2>&1 + /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 shadow='/etc/shadow' shdw=$(grep "^$FTP_USER:" $shadow)