From c32340e6d8797b2206cbc633487842d36fbabb43 Mon Sep 17 00:00:00 2001 From: David Piggott Date: Thu, 9 Apr 2015 17:25:52 +0100 Subject: [PATCH] Add back the archive-dir override but locate it at STORAGE_ROOT/backup/cache --- management/backup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/management/backup.py b/management/backup.py index 2285ee21..b0f41a81 100755 --- a/management/backup.py +++ b/management/backup.py @@ -130,6 +130,7 @@ def perform_backup(full_backup): exclusive_process("backup") backup_dir = os.path.join(env["STORAGE_ROOT"], 'backup') + backup_cache_dir = os.path.join(backup_dir, 'cache') backup_encrypted_dir = os.path.join(backup_dir, 'encrypted') # In an older version of this script, duplicity was called @@ -204,6 +205,7 @@ def perform_backup(full_backup): shell('check_call', [ "/usr/bin/duplicity", "full" if full_backup else "incr", + "--archive-dir", backup_cache_dir, "--exclude", backup_dir, "--volsize", "250", env["STORAGE_ROOT"], @@ -224,6 +226,7 @@ def perform_backup(full_backup): "/usr/bin/duplicity", "remove-older-than", "%dD" % keep_backups_for_days, + "--archive-dir", backup_cache_dir, "--force", "file://" + backup_encrypted_dir ], @@ -237,6 +240,7 @@ def perform_backup(full_backup): shell('check_call', [ "/usr/bin/duplicity", "cleanup", + "--archive-dir", backup_cache_dir, "--force", "file://" + backup_encrypted_dir ],