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

Removed xargs routine from backup procedure to fix oversized archives

Browse source
This commit is contained in:
Serghey Rodin 2014-04-26 15:01:05 +03:00
commit d3743dcfbb
1 changed files with 108 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

188
bin/v-backup-user
View file

@ -41,7 +41,7 @@ is_backup_enabled
# Set backup directory if undefined # Set backup directory if undefined
if [ -z "$BACKUP" ]; then if [ -z "$BACKUP" ]; then
BACKUP=/home/backup/ BACKUP=/home/backup
fi fi
mkdir -p $BACKUP mkdir -p $BACKUP
@ -86,7 +86,7 @@ if [ "$?" -ne 0 ]; then
exit $E_NOTEXIST exit $E_NOTEXIST
fi fi
# Backingup system configs # Backup sys configs
echo -e "-- SYSTEM --" echo -e "-- SYSTEM --"
msg="-- SYSTEM --" msg="-- SYSTEM --"
mkdir $tmpdir/vesta mkdir $tmpdir/vesta
@ -134,7 +134,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
msg="$msg\n-- WEB --" msg="$msg\n-- WEB --"
mkdir $tmpdir/web/ mkdir $tmpdir/web/
# Parsing web domain exclusions # Parsing domain exclusions
conf="$USER_DATA/web.conf" conf="$USER_DATA/web.conf"
for domain in $(search_objects 'web' 'SUSPENDED' "*" 'DOMAIN'); do for domain in $(search_objects 'web' 'SUSPENDED' "*" 'DOMAIN'); do
check_exl=$(echo -e "${WEB//,/\n}" |grep "^$domain$") check_exl=$(echo -e "${WEB//,/\n}" |grep "^$domain$")
@ -148,6 +148,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
web_list=$(echo "$web_list" | sed -e "s/ */\ /g" -e "s/^ //") web_list=$(echo "$web_list" | sed -e "s/ */\ /g" -e "s/^ //")
i=0 i=0
set -f
for domain in $web_list; do for domain in $web_list; do
((i ++)) ((i ++))
echo -e "$(date "+%F %T") $domain" echo -e "$(date "+%F %T") $domain"
@ -155,22 +156,22 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
mkdir -p $tmpdir/web/$domain/conf mkdir -p $tmpdir/web/$domain/conf
mkdir -p $tmpdir/web/$domain/vesta mkdir -p $tmpdir/web/$domain/vesta
# Defining domain variables # Get domain variables
domain_idn=$(idn -t --quiet -a "$domain") domain_idn=$(idn -t --quiet -a "$domain")
get_domain_values 'web' get_domain_values 'web'
# Creating web.config # Backup web.conf
cd $tmpdir/web/$domain/ cd $tmpdir/web/$domain/
conf="$USER_DATA/web.conf" conf="$USER_DATA/web.conf"
grep "DOMAIN='$domain'" $conf > vesta/web.conf grep "DOMAIN='$domain'" $conf > vesta/web.conf
# WEB config # Backup vhost config
tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl" tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
get_web_config_brds get_web_config_brds
sed -n "$top_line,$bottom_line p" $conf > conf/$WEB_SYSTEM.conf sed -n "$top_line,$bottom_line p" $conf > conf/$WEB_SYSTEM.conf
# SSL check # Backup ssl vhost
if [ "$SSL" = 'yes' ]; then if [ "$SSL" = 'yes' ]; then
tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl" tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
@ -178,37 +179,35 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
sed -n "$top_line,$bottom_line p" $conf > conf/s$WEB_SYSTEM.conf sed -n "$top_line,$bottom_line p" $conf > conf/s$WEB_SYSTEM.conf
fi fi
# Proxy config # Backup proxy config
if [ ! -z "$PROXY" ]; then if [ ! -z "$PROXY" ]; then
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl" tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
get_web_config_brds get_web_config_brds
sed -n "$top_line,$bottom_line p" $conf > conf/$PROXY_SYSTEM.conf sed -n "$top_line,$bottom_line p" $conf > conf/$PROXY_SYSTEM.conf
fi
# SSL proxy config # Backup ssl proxy config
if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ] ; then if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ] ; then
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
get_web_config_brds get_web_config_brds
sed -n "$top_line,$bottom_line p" $conf > conf/s$PROXY_SYSTEM.conf sed -n "$top_line,$bottom_line p" $conf > conf/s$PROXY_SYSTEM.conf
fi fi
fi
# Suplemental configs # Backup custom config
for sconfig in $(ls $HOMEDIR/$user/conf/web/|grep ".$domain.conf"); do for sconfig in $(ls $HOMEDIR/$user/conf/web/|grep ".$domain.conf"); do
cp $HOMEDIR/$user/conf/web/$sconfig conf/ cp $HOMEDIR/$user/conf/web/$sconfig conf/
done done
# SSL Certificates # Backup ssl certificates
if [ "$SSL" = 'yes' ] ; then if [ "$SSL" = 'yes' ] ; then
cp $HOMEDIR/$user/conf/web/ssl.$domain.* conf/ cp $HOMEDIR/$user/conf/web/ssl.$domain.* conf/
cp $USER_DATA/ssl/$domain.* vesta/ cp $USER_DATA/ssl/$domain.* vesta/
fi fi
# Packing data folders # Define exclude arguments
touch $tmpdir/web/$domain/domain_data.tar fargs=()
cd $HOMEDIR/$user/web/$domain
set -f
fargs+=(-not) fargs+=(-not)
fargs+=(-path) fargs+=(-path)
fargs+=("./logs*") fargs+=("./logs*")
@ -219,22 +218,34 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
xpath="$(echo $xpath | sed -e 's/\/*$//' -e 's/^\/*//')" xpath="$(echo $xpath | sed -e 's/\/*$//' -e 's/^\/*//')"
fargs+=(-not) fargs+=(-not)
fargs+=(-path) fargs+=(-path)
fargs+=("./$xpath*") fargs+=("./$xpath/*")
echo "$(date "+%F %T") excluding directory $xpath" echo "$(date "+%F %T") excluding directory $xpath"
msg="$msg\n$(date "+%F %T") excluding directory $xpath" msg="$msg\n$(date "+%F %T") excluding directory $xpath"
done done
fi fi
find . ${fargs[@]} |grep -v "^./$" | grep -v "^.$" |\
xargs tar -rpf $tmpdir/web/$domain/domain_data.tar
gzip -$BACKUP_GZIP $tmpdir/web/$domain/domain_data.tar
done
# Backup files
cd $HOMEDIR/$user/web/$domain
find . ${fargs[@]} -type f -print0 |\
tar -cpf $tmpdir/web/$domain/domain_data.tar --null -T -
# Backup empty folders
find . ${fargs[@]} -type d -empty -print0 |\
tar -rpf $tmpdir/web/$domain/domain_data.tar --null -T -
# Compress archive
gzip -$BACKUP_GZIP $tmpdir/web/$domain/domain_data.tar
done
set +f
# Print total
if [ "$i" -eq 1 ]; then if [ "$i" -eq 1 ]; then
echo -e "$(date "+%F %T") $i domain" echo -e "$(date "+%F %T") *** $i domain ***"
msg="$msg\n$(date "+%F %T") $i domain" msg="$msg\n$(date "+%F %T") *** $i domain ***"
else else
echo -e "$(date "+%F %T") $i domains" echo -e "$(date "+%F %T") *** $i domains ***"
msg="$msg\n$(date "+%F %T") $i domains" msg="$msg\n$(date "+%F %T") *** $i domains ***"
fi fi
echo echo
msg="$msg\n" msg="$msg\n"
@ -246,7 +257,7 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS" != '*' ]; then
msg="$msg\n-- DNS --" msg="$msg\n-- DNS --"
mkdir $tmpdir/dns/ mkdir $tmpdir/dns/
# Parsing dns domain exclusions # Parsing domain exclusions
for domain in $(search_objects 'dns' 'SUSPENDED' "*" 'DOMAIN'); do for domain in $(search_objects 'dns' 'SUSPENDED' "*" 'DOMAIN'); do
check_exl=$(echo -e "${DNS//,/\n}" |grep "^$domain$") check_exl=$(echo -e "${DNS//,/\n}" |grep "^$domain$")
if [ -z "$check_exl" ]; then if [ -z "$check_exl" ]; then
@ -268,24 +279,25 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS" != '*' ]; then
mkdir -p $tmpdir/dns/$domain/conf mkdir -p $tmpdir/dns/$domain/conf
mkdir -p $tmpdir/dns/$domain/vesta mkdir -p $tmpdir/dns/$domain/vesta
# Creating dns_domains config # Backup dns.conf
cd $tmpdir/dns/$domain/ cd $tmpdir/dns/$domain/
conf="$USER_DATA/dns.conf" conf="$USER_DATA/dns.conf"
grep "DOMAIN='$domain'" $conf > vesta/dns.conf grep "DOMAIN='$domain'" $conf > vesta/dns.conf
# Backingup dns recods # Backup dns recods
cp $USER_DATA/dns/$domain.conf vesta/$domain.conf cp $USER_DATA/dns/$domain.conf vesta/$domain.conf
if [ "$DNS_SYSTEM" != 'remote' ]; then if [ "$DNS_SYSTEM" != 'remote' ]; then
cp $HOMEDIR/$user/conf/dns/$domain.db conf/$domain.db cp $HOMEDIR/$user/conf/dns/$domain.db conf/$domain.db
fi fi
done done
# Print total
if [ "$i" -eq 1 ]; then if [ "$i" -eq 1 ]; then
echo -e "$(date "+%F %T") $i domain" echo -e "$(date "+%F %T") *** $i domain ***"
msg="$msg\n$(date "+%F %T") $i domain" msg="$msg\n$(date "+%F %T") *** $i domain ***"
else else
echo -e "$(date "+%F %T") $i domains" echo -e "$(date "+%F %T") *** $i domains ***"
msg="$msg\n$(date "+%F %T") $i domains" msg="$msg\n$(date "+%F %T") *** $i domains ***"
fi fi
echo echo
msg="$msg\n" msg="$msg\n"
@ -297,7 +309,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then
msg="$msg\n-- MAIL --" msg="$msg\n-- MAIL --"
mkdir $tmpdir/mail/ mkdir $tmpdir/mail/
# Parsing mail domain exclusions # Parsing domain exclusions
conf="$USER_DATA/mail.conf" conf="$USER_DATA/mail.conf"
for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
check_exl=$(echo -e "${MAIL//,/\n}" |grep "^$domain$") check_exl=$(echo -e "${MAIL//,/\n}" |grep "^$domain$")
@ -319,13 +331,13 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then
mkdir -p $tmpdir/mail/$domain/vesta mkdir -p $tmpdir/mail/$domain/vesta
domain_idn=$(idn -t --quiet -a "$domain") domain_idn=$(idn -t --quiet -a "$domain")
# Creating exim config # Backup exim config
if [[ "$MAIL_SYSTEM" =~ exim ]]; then if [[ "$MAIL_SYSTEM" =~ exim ]]; then
cd $tmpdir/mail/$domain/ cd $tmpdir/mail/$domain/
cp $HOMEDIR/$user/conf/mail/$domain/* conf/ cp $HOMEDIR/$user/conf/mail/$domain/* conf/
fi fi
# Creating vesta config # Backup mail.conf
conf="$USER_DATA/mail.conf" conf="$USER_DATA/mail.conf"
grep "DOMAIN='$domain'" $conf > vesta/mail.conf grep "DOMAIN='$domain'" $conf > vesta/mail.conf
cp $USER_DATA/mail/$domain.* vesta/ cp $USER_DATA/mail/$domain.* vesta/
@ -333,13 +345,16 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then
cp $USER_DATA/mail/*@$domain.* vesta/ cp $USER_DATA/mail/*@$domain.* vesta/
fi fi
# Packing mailboxes # Backup emails
cd $HOMEDIR/$user/mail/$domain_idn cd $HOMEDIR/$user/mail/$domain_idn
for account in $(ls); do for account in $(ls); do
exclusion=$(echo -e "${MAIL//,/\n}" |grep "$domain:") exclusion=$(echo -e "${MAIL//,/\n}" |grep "$domain:")
exclusion=$(echo -e "${exclusion//:/\n}" |grep "^$account$") exclusion=$(echo -e "${exclusion//:/\n}" |grep "^$account$")
# Checking exlusions
if [ -z "$exclusion" ] && [[ "$MAIL_SYSTEM" =~ exim ]]; then if [ -z "$exclusion" ] && [[ "$MAIL_SYSTEM" =~ exim ]]; then
echo "$(date "+%F %T") $account" echo "$(date "+%F %T") + $account@$domain"
msg="$msg\n$(date "+%F %T") + $account@$domain"
touch $tmpdir/mail/$domain/accounts.tar touch $tmpdir/mail/$domain/accounts.tar
tar -rpf $tmpdir/mail/$domain/accounts.tar $account tar -rpf $tmpdir/mail/$domain/accounts.tar $account
else else
@ -347,17 +362,20 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then
msg="$msg\n$(date "+%F %T") excluding account $account" msg="$msg\n$(date "+%F %T") excluding account $account"
fi fi
done done
# Compress archive
if [ -e "$tmpdir/mail/$domain/accounts.tar" ]; then if [ -e "$tmpdir/mail/$domain/accounts.tar" ]; then
gzip -$BACKUP_GZIP $tmpdir/mail/$domain/accounts.tar gzip -$BACKUP_GZIP $tmpdir/mail/$domain/accounts.tar
fi fi
done done
# Print total
if [ "$i" -eq 1 ]; then if [ "$i" -eq 1 ]; then
echo -e "$(date "+%F %T") $i domain" echo -e "$(date "+%F %T") *** $i domain ***"
msg="$msg\n$(date "+%F %T") $i domain" msg="$msg\n$(date "+%F %T") *** $i domain ***"
else else
echo -e "$(date "+%F %T") $i domains" echo -e "$(date "+%F %T") *** $i domains ***"
msg="$msg\n$(date "+%F %T") $i domains" msg="$msg\n$(date "+%F %T") *** $i domains ***"
fi fi
echo echo
msg="$msg\n" msg="$msg\n"
@ -380,16 +398,16 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then
msg="$msg\n$(date "+%F %T") excluding $database" msg="$msg\n$(date "+%F %T") excluding $database"
fi fi
done done
db_list=$(echo "$db_list" | sed -e "s/ */\ /g" -e "s/^ //")
i=0 i=0
conf="$USER_DATA/db.conf" conf="$USER_DATA/db.conf"
db_list=$(echo "$db_list" | sed -e "s/ */\ /g" -e "s/^ //")
for database in $db_list; do for database in $db_list; do
((i ++)) ((i ++))
get_database_values get_database_values
echo -e "$(date "+%F %T") $TYPE $database" echo -e "$(date "+%F %T") $database ($TYPE)"
msg="$msg\n$(date "+%F %T") $TYPE $database" msg="$msg\n$(date "+%F %T") $database ($TYPE)"
mkdir -p $tmpdir/db/$database/conf mkdir -p $tmpdir/db/$database/conf
mkdir -p $tmpdir/db/$database/vesta mkdir -p $tmpdir/db/$database/vesta
@ -403,15 +421,18 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then
mysql) dump_mysql_database ;; mysql) dump_mysql_database ;;
pgsql) dump_pgsql_database ;; pgsql) dump_pgsql_database ;;
esac esac
# Compress dump
gzip -$BACKUP_GZIP $dump gzip -$BACKUP_GZIP $dump
done done
# Print total
if [ "$i" -eq 1 ]; then if [ "$i" -eq 1 ]; then
echo -e "$(date "+%F %T") $i database" echo -e "$(date "+%F %T") *** $i database ***"
msg="$msg\n$(date "+%F %T") $i database" msg="$msg\n$(date "+%F %T") *** $i database ***"
else else
echo -e "$(date "+%F %T") $i databases" echo -e "$(date "+%F %T") *** $i databases ***"
msg="$msg\n$(date "+%F %T") $i databases" msg="$msg\n$(date "+%F %T") *** $i databases ***"
fi fi
echo echo
msg="$msg\n" msg="$msg\n"
@ -423,10 +444,7 @@ if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON" != '*' ]; then
msg="$msg\n-- CRON --" msg="$msg\n-- CRON --"
mkdir $tmpdir/cron/ mkdir $tmpdir/cron/
# Backingup cron recods # Backup cron.conf
echo -e "$(date "+%F %T") cron.conf"
msg="$msg\n$(date "+%F %T") cron.conf"
cp $USER_DATA/cron.conf $tmpdir/cron/ cp $USER_DATA/cron.conf $tmpdir/cron/
cron_record=$(wc -l $USER_DATA/cron.conf|cut -f 1 -d ' ') cron_record=$(wc -l $USER_DATA/cron.conf|cut -f 1 -d ' ')
@ -435,12 +453,13 @@ if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON" != '*' ]; then
cp /var/spool/cron/$user $tmpdir/cron/ cp /var/spool/cron/$user $tmpdir/cron/
fi fi
# Print total
if [ "$cron_record" -eq 1 ]; then if [ "$cron_record" -eq 1 ]; then
echo -e "$(date "+%F %T") $cron_record record" echo -e "$(date "+%F %T") *** $cron_record job ***"
msg="$msg\n$(date "+%F %T") $cron_record record" msg="$msg\n$(date "+%F %T") *** $cron_record job ***"
else else
echo -e "$(date "+%F %T") $cron_record records" echo -e "$(date "+%F %T") *** $cron_record jobs ***"
msg="$msg\n$(date "+%F %T") $cron_record records" msg="$msg\n$(date "+%F %T") *** $cron_record jobs ***"
fi fi
echo echo
msg="$msg\n" msg="$msg\n"
@ -453,12 +472,13 @@ if [ "$USER" != '*' ]; then
mkdir $tmpdir/user_dir mkdir $tmpdir/user_dir
cd $HOMEDIR/$user cd $HOMEDIR/$user
# Default excludes # Parsing directory exlusions
set -f USER=''
fargs='' if [ -e "$USER_DATA/backup-excludes.conf" ]; then
source $USER_DATA/backup-excludes.conf
# Parsing directory exlusion list fi
exlusion_list=$(echo -e "${USER//,/\n}") exlusion_list=$(echo -e "${USER//,/\n}")
fargs=()
for xpath in $exlusion_list; do for xpath in $exlusion_list; do
fargs+=(-not) fargs+=(-not)
fargs+=(-path) fargs+=(-path)
@ -467,6 +487,8 @@ if [ "$USER" != '*' ]; then
msg="$msg\n$(date "+%F %T") excluding directory $xpath" msg="$msg\n$(date "+%F %T") excluding directory $xpath"
done done
set -f
i=0
for udir in $(ls |egrep -v "conf|web|dns|mail"); do for udir in $(ls |egrep -v "conf|web|dns|mail"); do
check_exl=$(echo -e "${USER//,/\n}" |grep "^$udir$") check_exl=$(echo -e "${USER//,/\n}" |grep "^$udir$")
if [ -z "$check_exl" ]; then if [ -z "$check_exl" ]; then
@ -474,21 +496,29 @@ if [ "$USER" != '*' ]; then
udir_list="$udir_list $udir" udir_list="$udir_list $udir"
echo -e "$(date "+%F %T") adding directory $udir" echo -e "$(date "+%F %T") adding directory $udir"
msg="$msg\n$(date "+%F %T") adding directory $udir" msg="$msg\n$(date "+%F %T") adding directory $udir"
touch $tmpdir/user_dir/$udir.tar
find ./$udir ${fargs[@]} |grep -v "^./$" |grep -v "^.$" |\ # Backup files
grep -v "./$udir$" |\ find ./$udir ${fargs[@]} -type f -print0 |\
xargs tar -rpf $tmpdir/user_dir/$udir.tar tar -cpf $tmpdir/user_dir/$udir.tar --null -T -
# Backup empty folders
find ./$udir ${fargs[@]} -type d -empty -print0 |\
tar -rpf $tmpdir/user_dir/$udir.tar --null -T -
# Compress arhive
gzip -$BACKUP_GZIP $tmpdir/user_dir/$udir.tar gzip -$BACKUP_GZIP $tmpdir/user_dir/$udir.tar
fi fi
done done
set +f
udir_list=$(echo "$udir_list" | sed -e "s/ */\ /g" -e "s/^ //") udir_list=$(echo "$udir_list" | sed -e "s/ */\ /g" -e "s/^ //")
# Print total
if [ "$i" -eq 1 ]; then if [ "$i" -eq 1 ]; then
echo -e "$(date "+%F %T") $i user directory" echo -e "$(date "+%F %T") *** $i user directory ***"
msg="$msg\n$(date "+%F %T") $i directory" msg="$msg\n$(date "+%F %T") *** $i directory ***"
else else
echo -e "$(date "+%F %T") $i directories" echo -e "$(date "+%F %T") *** $i directories ***"
msg="$msg\n$(date "+%F %T") $i directories" msg="$msg\n$(date "+%F %T") *** $i directories ***"
fi fi
echo echo
msg="$msg\n" msg="$msg\n"
@ -508,8 +538,6 @@ local_backup(){
# Removing dublicate for this day # Removing dublicate for this day
if [ -e "$BACKUP/$user.$DATE.tar" ]; then if [ -e "$BACKUP/$user.$DATE.tar" ]; then
deprecated="$DATE" deprecated="$DATE"
echo -e "$(date "+%F %T") Deleted old backup: $user.$DATE.tar"
msg="$msg\n$(date "+%F %T") Deleted old backup: $user.$DATE.tar"
rm -f $BACKUP/$user.$DATE.tar rm -f $BACKUP/$user.$DATE.tar
fi fi
@ -524,8 +552,8 @@ local_backup(){
# Removing old backup # Removing old backup
backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//") backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//")
deprecated="$deprecated $backup_date" deprecated="$deprecated $backup_date"
echo -e "$(date "+%F %T") Deleted old backup: $backup_date" echo -e "$(date "+%F %T") Roated: $backup_date"
msg="$msg\n$(date "+%F %T") Deleted old backup: $backup_date" msg="$msg\n$(date "+%F %T") Rotated: $backup_date"
rm -f $BACKUP/$backup rm -f $BACKUP/$backup
done done
fi fi
@ -549,8 +577,8 @@ local_backup(){
chmod 640 $BACKUP/$user.$DATE.tar chmod 640 $BACKUP/$user.$DATE.tar
chown admin:$user $BACKUP/$user.$DATE.tar chown admin:$user $BACKUP/$user.$DATE.tar
localbackup='yes' localbackup='yes'
echo -e "$(date "+%F %T") Archived: $BACKUP/$user.$DATE.tar" echo -e "$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar"
msg="$msg\n$(date "+%F %T") Archived: $BACKUP/$user.$DATE.tar" msg="$msg\n$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar"
U_BACKUPS=$(ls $BACKUP/ | grep "^$user." | wc -l) U_BACKUPS=$(ls $BACKUP/ | grep "^$user." | wc -l)
update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS" update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS"
} }
@ -606,7 +634,7 @@ ftp_backup() {
# Debug info # Debug info
echo -e "$(date "+%F %T") FTP ftp://$HOST$BPATH/$user.$DATE.tar" echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$DATE.tar"
# Checking ftp connection # Checking ftp connection
fconn=$(ftpc) fconn=$(ftpc)
@ -644,8 +672,8 @@ ftp_backup() {
for backup in $(echo "$backup_list" | head -n $backups_rm_number); do for backup in $(echo "$backup_list" | head -n $backups_rm_number); do
backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//") backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//")
deprecated="$deprecated $backup" deprecated="$deprecated $backup"
echo -e "$(date "+%F %T") Deleted old ftp backup: $backup_date" echo -e "$(date "+%F %T") Roated ftp backup: $backup_date"
msg="$msg\n$(date "+%F %T") Deleted old ftp backup: $backup_date" msg="$msg\n$(date "+%F %T") Roated ftp backup: $backup_date"
ftpc "cd $BPATH" "delete $backup" ftpc "cd $BPATH" "delete $backup"
done done
fi fi
@ -692,8 +720,8 @@ fi
echo "$(date "+%F %T") Size: $size Mb" echo "$(date "+%F %T") Size: $size Mb"
msg="$msg\n$(date "+%F %T") Size: $size Mb" msg="$msg\n$(date "+%F %T") Size: $size Mb"
echo "$(date "+%F %T") RUNTIME: $run_time $min" echo "$(date "+%F %T") Runtime: $run_time $min"
msg="$msg\n$(date "+%F %T") RUNTIME: $run_time $min" msg="$msg\n$(date "+%F %T") Runtime: $run_time $min"
#----------------------------------------------------------# #----------------------------------------------------------#