github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-30 03:29:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved user rebuild function

Browse source
This commit is contained in:
Serghey Rodin 2012-09-27 11:07:25 +03:00
parent 82862ddf04
commit c1afcd1005
3 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v_add_user
View file

@ -94,7 +94,7 @@ fi
# Set permissions # Set permissions
chmod -R a+x $HOMEDIR/$user chmod a+x $HOMEDIR/$user
# Checking quota # Checking quota
if [ ! -z "$DISK_QUOTA" ] && [ "$DISK_QUOTA" != 'no' ]; then if [ ! -z "$DISK_QUOTA" ] && [ "$DISK_QUOTA" != 'no' ]; then

53
bin/v_rebuild_user
View file

@ -11,7 +11,6 @@
# Argument defenition # Argument defenition
user=$1 user=$1
full=${2-no}
# Includes # Includes
source $VESTA/conf/vesta.conf source $VESTA/conf/vesta.conf
@ -22,8 +21,8 @@ source $VESTA/func/main.sh
# Verifications # # Verifications #
#----------------------------------------------------------# #----------------------------------------------------------#
check_args '1' "$#" 'user [full]' check_args '1' "$#" 'user'
validate_format 'user' 'full' validate_format 'user'
is_object_valid 'user' 'USER' "$user" is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user"
@ -31,18 +30,17 @@ is_object_unsuspended 'user' 'USER' "$user"
#----------------------------------------------------------# #----------------------------------------------------------#
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
export PATH=$PATH:/usr/sbin
# Get user variables # Get user variables
source $USER_DATA/user.conf source $USER_DATA/user.conf
# Rebuild user # Rebuild user
shell=$(/usr/bin/chsh --list-shells | grep -w "$SHELL" |head -n1) shell=$(chsh --list-shells | grep -w "$SHELL" |head -n1)
/usr/sbin/adduser "$user" -s "$shell" -c "$CONTACT" -m -d "$HOMEDIR/$user" \ adduser "$user" -s "$shell" -c "$CONTACT" -m -d "$HOMEDIR/$user" &>/dev/null
&>/dev/null
# Change password # Update password
#/usr/sbin/usermod -p $MD5 $user shadow='/etc/shadow'
shadow=/tmp/shadow
shdw=$(grep ^$user: $shadow) shdw=$(grep ^$user: $shadow)
shdw3=$(echo "$shdw" | cut -f3 -d :) shdw3=$(echo "$shdw" | cut -f3 -d :)
shdw4=$(echo "$shdw" | cut -f4 -d :) shdw4=$(echo "$shdw" | cut -f4 -d :)
@ -56,13 +54,11 @@ sed -i "/^$user:*/d" $shadow
echo "$user:$MD5:$shdw3:$shdw4:$shdw5:$shdw6:$shdw7:$shdw8:$shdw9" >> $shadow echo "$user:$MD5:$shdw3:$shdw4:$shdw5:$shdw6:$shdw7:$shdw8:$shdw9" >> $shadow
chmod u-w $shadow chmod u-w $shadow
# Change shell
/usr/bin/chsh -s "$shell" "$user" &>/dev/null
# Building directory tree # Building directory tree
mkdir -p $HOMEDIR/$user
chmod -R a+x $HOMEDIR/$user
mkdir -p $HOMEDIR/$user/conf mkdir -p $HOMEDIR/$user/conf
chmod a+x $HOMEDIR/$user
chmod a+x $HOMEDIR/$user/conf
chown $user:$user $HOMEDIR/$user
chown $user:$user $HOMEDIR/$user/conf chown $user:$user $HOMEDIR/$user/conf
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
@ -73,9 +69,13 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
chmod 751 $HOMEDIR/$user/web chmod 751 $HOMEDIR/$user/web
chmod 777 $HOMEDIR/$user/tmp chmod 777 $HOMEDIR/$user/tmp
chown $user:$user $HOMEDIR/$user/web chown $user:$user $HOMEDIR/$user/web
if [ "$full" = 'yes' ]; then $BIN/v_rebuild_web_domains $user
$BIN/v_rebuild_web_domains $user fi
fi
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
mkdir -p $HOMEDIR/$user/conf/dns
chmod 751 $HOMEDIR/$user/conf/dns
$BIN/v_rebuild_dns_domains $user
fi fi
if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
@ -83,29 +83,16 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
mkdir -p $HOMEDIR/$user/mail mkdir -p $HOMEDIR/$user/mail
chmod 751 $HOMEDIR/$user/mail chmod 751 $HOMEDIR/$user/mail
chmod 751 $HOMEDIR/$user/conf/mail chmod 751 $HOMEDIR/$user/conf/mail
if [ "$full" = 'yes' ]; then $BIN/v_rebuild_mail_domains $user
$BIN/v_rebuild_mail_domains $user
fi
fi fi
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
mkdir -p $HOMEDIR/$user/conf/dns
chmod 751 $HOMEDIR/$user/conf/dns
if [ "$full" = 'yes' ]; then
$BIN/v_rebuild_dns_domains $user
fi
fi
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
if [ "$full" = 'yes' ]; then $BIN/v_rebuild_databases $user
$BIN/v_rebuild_databases $user
fi
fi fi
if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then
if [ "$full" = 'yes' ]; then $BIN/v_rebuild_cron_jobs $user
$BIN/v_rebuild_cron_jobs $user
fi
fi fi

5
bin/v_update_user_counters
View file

@ -169,6 +169,11 @@ for user in $user_list; do
fi fi
done done
# Checking backup
for backup_str in $(cat $USER_DATA/backup.conf); do
U_BACKUPS=$((U_BACKUPS +1))
done
U_DISK=$DISK U_DISK=$DISK
U_BANDWIDTH=$BANDWIDTH U_BANDWIDTH=$BANDWIDTH
update_user_value "$user" '$SUSPENDED_USERS' "$SUSPENDED_USERS" update_user_value "$user" '$SUSPENDED_USERS' "$SUSPENDED_USERS"