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

Merge pull request #1237 from cmstew/cmstew-v-user-backup-patch

Browse source 
Update v-backup-user / Fix from @cmstew
This commit is contained in:
Serghey Rodin 2017-12-06 23:38:51 +02:00 • committed by GitHub
commit d5f78d5aa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bin/v-backup-user
View file

@ -484,7 +484,6 @@ local_backup(){
backups_count=$(echo "$backup_list" |wc -l) backups_count=$(echo "$backup_list" |wc -l)
if [ "$BACKUPS" -le "$backups_count" ]; then if [ "$BACKUPS" -le "$backups_count" ]; then
backups_rm_number=$((backups_count - BACKUPS)) backups_rm_number=$((backups_count - BACKUPS))
(( ++backups_rm_number))
# Removing old backup # Removing old 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
@ -600,7 +599,7 @@ ftp_backup() {
fi fi
backups_count=$(echo "$backup_list" |wc -l) backups_count=$(echo "$backup_list" |wc -l)
if [ "$backups_count" -ge "$BACKUPS" ]; then if [ "$backups_count" -ge "$BACKUPS" ]; then
backups_rm_number=$((backups_count - BACKUPS + 1)) backups_rm_number=$((backups_count - BACKUPS))
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$//")
echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\ echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\
@ -755,7 +754,7 @@ sftp_backup() {
fi fi
backups_count=$(echo "$backup_list" |wc -l) backups_count=$(echo "$backup_list" |wc -l)
if [ "$backups_count" -ge "$BACKUPS" ]; then if [ "$backups_count" -ge "$BACKUPS" ]; then
backups_rm_number=$((backups_count - BACKUPS + 1)) backups_rm_number=$((backups_count - BACKUPS))
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.*$//")
echo -e "$(date "+%F %T") Rotated sftp backup: $backup_date" |\ echo -e "$(date "+%F %T") Rotated sftp backup: $backup_date" |\
@ -804,7 +803,7 @@ google_backup() {
backup_list=$(${gsutil} ls gs://$BUCKET/$BPATH/$user.* 2>/dev/null) backup_list=$(${gsutil} ls gs://$BUCKET/$BPATH/$user.* 2>/dev/null)
backups_count=$(echo "$backup_list" |wc -l) backups_count=$(echo "$backup_list" |wc -l)
if [ "$backups_count" -ge "$BACKUPS" ]; then if [ "$backups_count" -ge "$BACKUPS" ]; then
backups_rm_number=$((backups_count - BACKUPS + 1)) backups_rm_number=$((backups_count - BACKUPS))
for backup in $(echo "$backup_list" |head -n $backups_rm_number); do for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
echo -e "$(date "+%F %T") Roated gcp backup: $backup" echo -e "$(date "+%F %T") Roated gcp backup: $backup"
$gsutil rm $backup > /dev/null 2>&1 $gsutil rm $backup > /dev/null 2>&1