From d611f0d71dbfffde16e3d8bea01557237cc2c6ae Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Thu, 26 May 2022 21:17:02 +0200 Subject: Put backup prune defaults in the default configuration file --- lib/subcommands/backup.bash | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/subcommands/backup.bash b/lib/subcommands/backup.bash index 2765172..3a7b426 100644 --- a/lib/subcommands/backup.bash +++ b/lib/subcommands/backup.bash @@ -71,10 +71,10 @@ backup_filesystem() { info "$BASHTARD_NAME/backup/$index" "Pruning filesystem backups in $repo" cmd_prune=( "$borg" "prune" - "--keep-daily" "$(config "bashtard.backup.keep.daily" 7)" - "--keep-weekly" "$(config "bashtard.backup.keep.weekly" 4)" - "--keep-monthly" "$(config "bashtard.backup.keep.monthly" 6)" - "--keep-yearly" "$(config "bashtard.backup.keep.yearly" 1)" + "--keep-daily" "$(config "bashtard.backup.keep.daily")" + "--keep-weekly" "$(config "bashtard.backup.keep.weekly")" + "--keep-monthly" "$(config "bashtard.backup.keep.monthly")" + "--keep-yearly" "$(config "bashtard.backup.keep.yearly")" "--prefix" "{fqdn}-" "--remote-path" "$remote" "$repo/hostfs" @@ -137,10 +137,10 @@ backup_database_postgresql() { # Prune old backups info "$BASHTARD_NAME/backup/$index" "Pruning PostgreSQL backups of $database in $repo" $borg prune \ - --keep-daily "$(config "bashtard.backup.keep.daily" 7)" \ - --keep-weekly "$(config "bashtard.backup.keep.weekly" 4)" \ - --keep-monthly "$(config "bashtard.backup.keep.monthly" 6)" \ - --keep-yearly "$(config "bashtard.backup.keep.yearly" 1)" \ + --keep-daily "$(config "bashtard.backup.keep.daily")" \ + --keep-weekly "$(config "bashtard.backup.keep.weekly")" \ + --keep-monthly "$(config "bashtard.backup.keep.monthly")" \ + --keep-yearly "$(config "bashtard.backup.keep.yearly")" \ --prefix "$database-" \ --remote-path "$remote" \ "$repo/postgresql-$database" -- cgit v1.1