diff --git a/bin/v_backup_user b/bin/v_backup_user index 9b476bd7..91c4417e 100755 --- a/bin/v_backup_user +++ b/bin/v_backup_user @@ -390,6 +390,9 @@ local_backup(){ chown nginx:$user $BACKUP/$user.$DATE.tar localbackup='yes' echo + + U_BACKUPS=$(ls $BACKUP/|grep "^$user."|wc -l) + update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS" } diff --git a/bin/v_delete_user_backup b/bin/v_delete_user_backup new file mode 100755 index 00000000..f385021a --- /dev/null +++ b/bin/v_delete_user_backup @@ -0,0 +1,53 @@ +#!/bin/bash +# info: delete user backup +# options: user nackup +# +# The function deletes user backup. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 +backup=$(echo $2| cut -f 2 -d \.) + +# Includes +source $VESTA/conf/vesta.conf +source $VESTA/func/main.sh + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '2' "$#" 'user backup' +validate_format 'user' 'backup' +is_system_enabled "$BACKUP_SYSTEM" +is_object_valid 'user' 'USER' "$user" +is_object_unsuspended 'user' 'USER' "$user" +is_object_valid 'backup' 'BACKUP' "$2" + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Deleting backup +rm -f $BACKUP/$2 +sed -i "/BACKUP='$2' /d" $USER_DATA/backup.conf + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Update counter +U_BACKUPS=$(ls $BACKUP/|grep "^$user."|wc -l) +update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS" + +# Logging +log_history "$EVENT" +log_event "$OK" "$EVENT" + +exit diff --git a/func/main.sh b/func/main.sh index d1f2bc96..a37d2edd 100644 --- a/func/main.sh +++ b/func/main.sh @@ -13,6 +13,8 @@ A8=$8 A9=$9 EVENT="DATE='$DATE' TIME='$TIME' CMD='$SCRIPT' A1='$A1' A2='$A2' A3='$A3'" EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'" +HOMEDIR='/home' +BACKUP='/backup' BACKUP_GZIP=5 BACKUP_DISK_LIMIT=95 BACKUP_LA_LIMIT=5 diff --git a/web/delete/backup/index.php b/web/delete/backup/index.php new file mode 100644 index 00000000..e2b9effb --- /dev/null +++ b/web/delete/backup/index.php @@ -0,0 +1,17 @@ + diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html index ad9b33bb..25e7ea6e 100644 --- a/web/templates/admin/list_backup.html +++ b/web/templates/admin/list_backup.html @@ -13,7 +13,46 @@ foreach ($data as $key => $value) { if (!empty($data[$key]['MAIL'])) $mail = 'yes ¨'; if (!empty($data[$key]['DB'])) $db = 'yes ¨'; ?> + @@ -25,9 +64,21 @@ foreach ($data as $key => $value) {
- - - + + +
download restore delete download + + "> restore +
" title="Confirmation"> +

Are you sure you want to restore backup?

+
+
+ + delete +
+

Are you sure you want to delete backup?

+
+
diff --git a/web/templates/admin/menu_backup.html b/web/templates/admin/menu_backup.html index 94674655..987d197d 100644 --- a/web/templates/admin/menu_backup.html +++ b/web/templates/admin/menu_backup.html @@ -1,7 +1,7 @@