Skip to content

Commit dee9dcc

Browse files
committed
changed uid for additional ftp account
1 parent e246152 commit dee9dcc

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

bin/v-add-web-domain-ftp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ if [ ! -z "$FTP_USER" ]; then
5656
fi
5757

5858
# Adding user
59-
/usr/sbin/adduser $ftp_user -g $user -s /sbin/nologin -M \
60-
-d "$HOMEDIR/$user/web/$domain" > /dev/null 2>&1
59+
/usr/sbin/adduser -o -u $(id -u $user) -g $user -s /sbin/nologin -M \
60+
-d "$HOMEDIR/$user/web/$domain" $ftp_user > /dev/null 2>&1
6161
echo "$ftp_password" | /usr/bin/passwd "$ftp_user" --stdin &>/dev/null
6262
ftp_md5="$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)"
6363

bin/v-delete-web-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ fi
9090

9191
# Deleting ftp account
9292
if [ ! -z "$FTP_USER" ]; then
93-
/usr/sbin/userdel $FTP_USER
93+
/usr/sbin/userdel -f $FTP_USER >> /dev/null 2>&1
9494
fi
9595

9696
# Deleting directory

bin/v-delete-web-domain-ftp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$FTP_USER'
3838
# Action #
3939
#----------------------------------------------------------#
4040

41-
# Adding user
41+
# Deleting ftp user
4242
get_domain_values 'web'
43-
/usr/sbin/userdel $FTP_USER
43+
/usr/sbin/userdel -f $FTP_USER >> /dev/null 2>&1
4444

4545

4646
#----------------------------------------------------------#

bin/v-rebuild-web-domains

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ for domain in $(shell_list) ; do
219219
# Checking ftp
220220
if [ ! -z "$FTP_USER" ]; then
221221
if [ -z "$(grep ^$FTP_USER: /etc/passwd)" ]; then
222-
/usr/sbin/adduser $FTP_USER -g $user -s /sbin/nologin -M \
223-
-d "$HOMEDIR/$user/web/$domain" > /dev/null 2>&1
222+
/usr/sbin/adduser -o -u $(id -u $user) -g $user -s /sbin/nologin \
223+
-M -d "$HOMEDIR/$user/web/$domain" $FTP_USER > /dev/null 2>&1
224224

225225
shadow='/etc/shadow'
226226
shdw=$(grep "^$FTP_USER:" $shadow)

0 commit comments

Comments
 (0)