github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-20 21:34:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for additional accounts on Ubuntu and Debian

Browse source
This commit is contained in:
Serghey Rodin 2013-10-12 18:32:07 +03:00
commit aace12f63f
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bin/v-add-web-domain-ftp
View file

@ -52,7 +52,7 @@ if [ ! -z "$check_ftp_user" ] && [ "$FTP_USER" != "$ftp_user" ]; then
fi fi
if [ ! -z "$FTP_USER" ]; then if [ ! -z "$FTP_USER" ]; then
/usr/sbin/userdel -f $FTP_USER /usr/sbin/userdel -f $FTP_USER > /dev/null 2>&1
fi fi
# Define shell # Define shell
@ -62,12 +62,11 @@ if [ -e "/usr/bin/rssh" ]; then
fi fi
# Adding user # Adding user
/usr/sbin/adduser -o -u $(id -u $user) \ /usr/sbin/useradd $ftp_user \
-g $user \
-s $shell \ -s $shell \
-M -d "$HOMEDIR/$user/web/$domain" \ -o -u $(id -u $user) \
$ftp_user > /dev/null 2>&1 -g $user \
-M -d "$HOMEDIR/$user/web/$domain" > /dev/null 2>&1
echo "$ftp_user:$ftp_password" | /usr/sbin/chpasswd echo "$ftp_user:$ftp_password" | /usr/sbin/chpasswd
ftp_md5="$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)" ftp_md5="$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)"

11
func/rebuild.sh
View file

@ -322,8 +322,15 @@ rebuild_web_domain_conf() {
# Checking ftp # Checking ftp
if [ ! -z "$FTP_USER" ]; then if [ ! -z "$FTP_USER" ]; then
if [ -z "$(grep ^$FTP_USER: /etc/passwd)" ]; then if [ -z "$(grep ^$FTP_USER: /etc/passwd)" ]; then
/usr/sbin/adduser -o -u $(id -u $user) -g $user -s /sbin/nologin \ shell='/sbin/nologin'
-M -d "$HOMEDIR/$user/web/$domain" $FTP_USER > /dev/null 2>&1 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 # Update password
shadow=$(grep "^$FTP_USER:" /etc/shadow) shadow=$(grep "^$FTP_USER:" /etc/shadow)