@@ -18,6 +18,9 @@ source $VESTA/func/main.sh
1818source $VESTA/func/domain.sh
1919source $VESTA/func/db.sh
2020
21+ subj="Backup $user failed"
22+ email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \')
23+
2124
2225#----------------------------------------------------------#
2326# Verifications #
@@ -36,6 +39,7 @@ while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do
3639 echo
3740 sleep 60
3841 if [ "$i" -ge "15" ]; then
42+ echo "LoadAverage $i is above threshold" | mail -s "$subj" $email
3943 echo "Error: LA is too high"
4044 log_event "$E_LA" "$EVENT"
4145 exit $E_LA
@@ -53,16 +57,17 @@ start_time=$(date '+%s')
5357
5458# Creating temporary random directory
5559tmpdir=$(mktemp -p $BACKUP -d)
60+ if [ "$?" -ne 0 ]; then
61+ echo "Can't create tmp dir $tmpdir" | mail -s "$subj" $email
62+ echo "Error: can't create tmp dir"
63+ log_event "$E_NOTEXIST" "$EVENT"
64+ fi
5665
5766# Prinitng status
5867echo "$(date "+%F %T") System backup for user $user"
5968echo "TMPDIR is $tmpdir"
6069echo
6170
62- # Addding backup and vesta version
63- echo "1.0" > $tmpdir/backup_version
64- echo "$VERSION" > $tmpdir/vesta_version
65-
6671# Vesta
6772echo "-- VESTA --"
6873vst='yes'
123128 # Parsing unsuspeneded domains
124129 conf="$USER_DATA/web.conf"
125130 for domain in $(search_objects 'web' 'SUSPENDED' "*" 'DOMAIN'); do
126- check_exl=$(echo "$WEB"|grep -w $domain)
131+ check_exl=$(echo "$WEB"|grep -w $domain)
127132 if [ -z "$check_exl" ]; then
128133 web_list="$web_list $domain"
129134 fi
208213
209214 # Parsing unsuspeneded domains
210215 for domain in $(search_objects 'dns' 'SUSPENDED' "*" 'DOMAIN'); do
211- check_exl=$(echo "$DNS"|grep -w $domain)
216+ check_exl=$(echo "$DNS"|grep -w $domain)
212217 if [ -z "$check_exl" ]; then
213218 dns_list="$dns_list $domain"
214219 fi
243248 # Parsing unsuspeneded domains
244249 conf="$USER_DATA/mail.conf"
245250 for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
246- check_exl=$(echo "$MAIL"|grep -w $domain)
251+ check_exl=$(echo "$MAIL"|grep -w $domain)
247252 if [ -z "$check_exl" ]; then
248253 mail_list="$mail_list $domain"
249254 fi
252257
253258 for domain in $mail_list; do
254259 echo -e "$(date "+%F %T") $domain"
255- #mkdir -p $tmpdir/mail/$domain/accounts
256260 mkdir -p $tmpdir/mail/$domain/conf
257261 mkdir -p $tmpdir/mail/$domain/vesta
258262
@@ -290,7 +294,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ] && [ "$DB" != '*' ]; then
290294
291295 # Parsing unsuspeneded domains
292296 for database in $(search_objects 'db' 'SUSPENDED' "*" 'DB'); do
293- check_exl=$(echo "$DB"|grep -w $database)
297+ check_exl=$(echo "$DB"|grep -w $database)
294298 if [ -z "$check_exl" ]; then
295299 db_list="$db_list $database"
296300 fi
@@ -379,6 +383,8 @@ local_backup(){
379383 disk_usage=$(df $BACKUP |tail -n1 |tr ' ' '\n' |grep % |cut -f 1 -d %)
380384
381385 if [ "$disk_usage" -ge "$BACKUP_DISK_LIMIT" ]; then
386+ rm -rf $tmpdir
387+ echo "Not enough disk space to run backup" | mail -s "$subj" $email
382388 echo "Error: Not enough disk space"
383389 log_event "$E_DISK" "$EVENT"
384390 exit $E_DISK
@@ -417,6 +423,8 @@ ftp_backup(){
417423 source $VESTA/conf/ftp.backup.conf
418424 if [ -z "$HOST" ] || [ -z "$USERNAME" ] || [ -z "$PASSWORD" ] ||\
419425 [ -z "$BPATH" ]; then
426+ rm -rf $tmpdir
427+ echo "Can't parse ftp backup configuration" | mail -s "$subj" $email
420428 echo "Error: Parsing error"
421429 log_event "$E_PARSING" "$EVENT"
422430 exit $E_PARSING
@@ -432,6 +440,8 @@ ftp_backup(){
432440 ls $ftmpdir
433441 rm $ftmpdir"
434442 if [ ! -z "$(ftpc "$command")" ] ; then
443+ rm -rf $tmpdir
444+ echo "Can't login to ftp://$USERNAME@$HOST" | mail -s "$subj" $email
435445 echo "Error: FTP error"
436446 log_event "$E_FTP" "$EVENT"
437447 exit $E_FTP
@@ -453,12 +463,12 @@ ftp_backup(){
453463 # Uploading backup archive
454464 if [ "$localbackup" = 'yes' ]; then
455465 cd $BACKUP
456- ftpc "put $user.$DATE.tar"
466+ ftpc "put $user.$DATE.tar"
457467 else
458- cd $tmpdir
468+ cd $tmpdir
459469 tar -cf $BACKUP/$user.$DATE.tar .
460470 cd $BACKUP/
461- ftpc "put $user.$DATE.tar"
471+ ftpc "put $user.$DATE.tar"
462472 rm -f $user.$DATE.tar
463473 fi
464474 echo
0 commit comments