YunoHost-Apps/borg_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/borg_ynh.git synced 2024-09-03 18:16:05 +02:00
Code Issues Activity Actions

[fix] Legacy archive name pruning mess

Browse source
This commit is contained in:
ljf (zamentur) 2021-04-14 13:05:25 +02:00 • committed by GitHub
parent 3f45ac523d
commit 0062d0c3c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
conf/backup_method
View file

@ -30,7 +30,7 @@ do_backup() {
repo="$3" repo="$3"
size="$4" size="$4"
description="$5" description="$5"
current_date=$(date +"%d_%m_%y_%H:%M") current_date=$(date +"%Y-%m-%d_%H:%M")
pushd "$work_dir" pushd "$work_dir"
set +e set +e
if borg init -e repokey "$repo" ; then if borg init -e repokey "$repo" ; then
@ -46,12 +46,18 @@ This is an automated message from your beloved YunoHost server." | /usr/bin/mail
fi fi
set -e set -e
borg create "$repo::${name}_${current_date}" ./ 2>&1 >/dev/null | log_with_timestamp borg create "$repo::_${name}-${current_date}" ./ 2>&1 >/dev/null | log_with_timestamp
popd popd
# About thi _20 it's a crazy fix to avoid pruning wordpress__2 # About thi _20 it's a crazy fix to avoid pruning wordpress__2
# if you prune wordpress # if you prune wordpress
borg prune "$repo" -P ${name}_20 --keep-hourly 2 --keep-daily=7 --keep-weekly=8 --keep-monthly=12 2>&1 >/dev/null | log_with_timestamp borg prune "$repo" -P "_${name}-" --keep-hourly 2 --keep-daily=7 --keep-weekly=8 --keep-monthly=12 2>&1 >/dev/null | log_with_timestamp
# Prune legacy archive name without error on wordpress/wordpress__2
borg prune "$repo" -P "${name}_" --keep-within 2m --keep-monthly=12 2>&1 >/dev/null | log_with_timestamp
# We prune potential manual backup older than 1 year
borg prune "$repo" --keep-within 1y 2>&1 >/dev/null | log_with_timestamp
} }
do_mount() { do_mount() {