full backup and restore

Author: serghey-rodin

bin/v-backup-user

@@ -300,6 +300,7 @@ then
         msg="$msg\n$(date "+%F %T") $domain"
         mkdir -p $tmpdir/mail/$domain/conf
         mkdir -p $tmpdir/mail/$domain/vesta
+        domain_idn=$(idn -t --quiet -a "$domain")
 
         # Creating exim config
         cd $tmpdir/mail/$domain/
@@ -314,7 +315,7 @@ then
         fi
 
         # Packing mailboxes
-        cd $HOMEDIR/$user/mail/$domain
+        cd $HOMEDIR/$user/mail/$domain_idn
         accounts=$(ls)
         if [ ! -z "$accounts" ]; then
             tar -cpf $tmpdir/mail/$domain/accounts.tar  $accounts
@@ -336,7 +337,7 @@ then
 fi
 
 
-# DataBases
+# Databases
 if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ] && [ "$DB" != '*' ]; then
     echo "-- DB --"
     msg="$msg\n-- DB --"
@@ -553,7 +554,6 @@ ftp_backup() {
 
     # Debug info
     echo -e "$(date "+%F %T") FTP ftp://$HOST$BPATH/$user.$DATE.tar"
-    msg="$msg\n$(date "+%F %T") FTP ftp://$HOST$BPATH/$user.$DATE.tar"
 
     # Checking ftp connection
     if [ ! -z "$(ftpc)" ]; then

bin/v-rebuild-user

@@ -16,6 +16,10 @@ restart=$2
 # Includes
 source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
+source $VESTA/func/rebuild.sh
+
+# Export sbin
+export PATH=$PATH:/usr/sbin
 
 
 #----------------------------------------------------------#
@@ -31,131 +35,15 @@ is_object_unsuspended 'user' 'USER' "$user"
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
-export PATH=$PATH:/usr/sbin
-
-# Get user variables
-source $USER_DATA/user.conf
 
 # Rebuild user
-shell=$(chsh --list-shells | grep -w "$SHELL" |head -n1)
-adduser "$user" -s "$shell" -c "$CONTACT" -m -d "$HOMEDIR/$user" &>/dev/null
-
-# Update user shell
-shell_path=$(/usr/bin/chsh --list-shells | grep -w "$SHELL" |head -n1)
-/usr/bin/chsh -s "$shell_path" "$user" &>/dev/null
-
-# Update password
-shadow='/etc/shadow'
-shdw=$(grep ^$user: $shadow)
-shdw3=$(echo "$shdw" | cut -f3 -d :)
-shdw4=$(echo "$shdw" | cut -f4 -d :)
-shdw5=$(echo "$shdw" | cut -f5 -d :)
-shdw6=$(echo "$shdw" | cut -f6 -d :)
-shdw7=$(echo "$shdw" | cut -f7 -d :)
-shdw8=$(echo "$shdw" | cut -f8 -d :)
-shdw9=$(echo "$shdw" | cut -f9 -d :)
-chmod u+w $shadow
-sed -i "/^$user:*/d" $shadow
-echo "$user:$MD5:$shdw3:$shdw4:$shdw5:$shdw6:$shdw7:$shdw8:$shdw9" >> $shadow
-chmod u-w $shadow
-
-# Building directory tree
-mkdir -p $HOMEDIR/$user/conf
-chmod a+x $HOMEDIR/$user
-chmod a+x $HOMEDIR/$user/conf
-chown $user:$user $HOMEDIR/$user
-chown root:root $HOMEDIR/$user/conf
-chattr +i $HOMEDIR/$user/conf
-
-if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
-    mkdir -p $HOMEDIR/$user/conf/web
-    mkdir -p $HOMEDIR/$user/web
-    mkdir -p $HOMEDIR/$user/tmp
-    chmod 751 $HOMEDIR/$user/conf/web
-    chmod 751 $HOMEDIR/$user/web
-    chmod 771 $HOMEDIR/$user/tmp
-    chown $user:$user $HOMEDIR/$user/web
-    $BIN/v-rebuild-web-domains $user $restart
-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 $restart
-fi
-
-if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
-    mkdir -p $HOMEDIR/$user/conf/mail
-    mkdir -p $HOMEDIR/$user/mail
-    chmod 751 $HOMEDIR/$user/mail
-    chmod 751 $HOMEDIR/$user/conf/mail
-    $BIN/v-rebuild-mail-domains $user
-fi
-
-
-if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
-    $BIN/v-rebuild-databases $user
-fi
-
-if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then
-    $BIN/v-rebuild-cron-jobs $user $restart
-fi
+rebuild_user_conf
 
 
 #----------------------------------------------------------#
 #                       Vesta                              #
 #----------------------------------------------------------#
 
-# Creating configuration files and pipes
-chmod 770 $USER_DATA
-touch $USER_DATA/backup.conf
-chmod 660 $USER_DATA/backup.conf
-touch $USER_DATA/history.log
-chmod 660 $USER_DATA/history.log
-touch $USER_DATA/stats.log
-chmod 660 $USER_DATA/stats.log
-
-sed -i "/ $user$/d" $VESTA/data/queue/disk.pipe
-echo "$BIN/v-update-user-disk $user" >> $VESTA/data/queue/disk.pipe
-
-if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
-    mkdir -p $USER_DATA/ssl
-    chmod 770 $USER_DATA/ssl
-    touch $USER_DATA/web.conf
-    chmod 660 $USER_DATA/web.conf
-    if [ "$(grep -w $user $VESTA/data/queue/traffic.pipe)" ]; then
-        echo "$BIN/v-update-web-domains-traff $user" \
-            >> $VESTA/data/queue/traffic.pipe
-    fi
-    echo "$BIN/v-update-web-domains-disk $user" >> $VESTA/data/queue/disk.pipe
-fi
-
-if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
-    mkdir -p $USER_DATA/dns
-    chmod 770 $USER_DATA/dns
-    touch $USER_DATA/dns.conf
-    chmod 660 $USER_DATA/dns.conf
-fi
-
-if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
-    mkdir -p $USER_DATA/mail
-    chmod 770 $USER_DATA/mail
-    touch $USER_DATA/mail.conf
-    chmod 660 $USER_DATA/mail.conf
-    echo "$BIN/v-update-mail-domains-disk $user" >> $VESTA/data/queue/disk.pipe
-fi
-
-if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
-    touch $USER_DATA/db.conf
-    chmod 660 $USER_DATA/db.conf
-    echo "$BIN/v-update-databases-disk $user" >> $VESTA/data/queue/disk.pipe
-fi
-
-if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then
-    touch $USER_DATA/cron.conf
-    chmod 660 $USER_DATA/cron.conf
-fi
-
 # Logging
 log_event "$OK" "$EVENT"