external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add back the archive-dir override but locate it at STORAGE_ROOT/backup/cache

This commit is contained in:
David Piggott 2015-04-09 17:25:52 +01:00
parent 5b62cb070a
commit c32340e6d8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
management/backup.py
View File

@ -130,6 +130,7 @@ def perform_backup(full_backup):
exclusive_process("backup") exclusive_process("backup")
backup_dir = os.path.join(env["STORAGE_ROOT"], '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') backup_encrypted_dir = os.path.join(backup_dir, 'encrypted')
# In an older version of this script, duplicity was called # In an older version of this script, duplicity was called
@ -204,6 +205,7 @@ def perform_backup(full_backup):
shell('check_call', [ shell('check_call', [
"/usr/bin/duplicity", "/usr/bin/duplicity",
"full" if full_backup else "incr", "full" if full_backup else "incr",
"--archive-dir", backup_cache_dir,
"--exclude", backup_dir, "--exclude", backup_dir,
"--volsize", "250", "--volsize", "250",
env["STORAGE_ROOT"], env["STORAGE_ROOT"],
@ -224,6 +226,7 @@ def perform_backup(full_backup):
"/usr/bin/duplicity", "/usr/bin/duplicity",
"remove-older-than", "remove-older-than",
"%dD" % keep_backups_for_days, "%dD" % keep_backups_for_days,
"--archive-dir", backup_cache_dir,
"--force", "--force",
"file://" + backup_encrypted_dir "file://" + backup_encrypted_dir
], ],
@ -237,6 +240,7 @@ def perform_backup(full_backup):
shell('check_call', [ shell('check_call', [
"/usr/bin/duplicity", "/usr/bin/duplicity",
"cleanup", "cleanup",
"--archive-dir", backup_cache_dir,
"--force", "--force",
"file://" + backup_encrypted_dir "file://" + backup_encrypted_dir
], ],