external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-28 19:47:23 +01:00
Code Issues Releases Wiki Activity

clean up the new backup configuration panel

Browse Source
This commit is contained in:
Joshua Tauberer
2015-08-09 17:52:24 +00:00
parent 3f15879578
commit c7f8ead496
2 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
management/backup.py
View File

@@ -25,7 +25,6 @@ def backup_status(env):
now = datetime.datetime.now(dateutil.tz.tzlocal())
backups = { }
backup_dir = os.path.join(backup_root, 'encrypted')
backup_cache_dir = os.path.join(backup_root, 'cache')
def reldate(date, ref, clip):
@@ -112,8 +111,6 @@ def backup_status(env):
bak["deleted_in"] = deleted_in
return {
"directory": backup_dir,
"encpwfile": os.path.join(backup_root, 'secret_key.txt'),
"tz": now.tzname(),
"backups": backups,
}
@@ -302,7 +299,7 @@ def run_duplicity_verification():
def backup_set_custom(env, target, target_user, target_pass, min_age):
config = get_backup_config(env)
config = get_backup_config(env, for_save=True)
# min_age must be an int
if isinstance(min_age, str):
@@ -317,14 +314,16 @@ def backup_set_custom(env, target, target_user, target_pass, min_age):
return "Updated backup config"
def get_backup_config(env):
def get_backup_config(env, for_save=False):
backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
# Defaults.
config = {
"min_age_in_days": 3,
"target": "file://" + os.path.join(backup_root, 'encrypted'),
}
# Merge in anything written to custom.yaml.
try:
custom_config = rtyaml.load(open(os.path.join(backup_root, 'custom.yaml')))
if not isinstance(custom_config, dict): raise ValueError() # caught below
@@ -332,6 +331,14 @@ def get_backup_config(env):
except:
pass
# When updating config.yaml, don't do any further processing on what we find.
if for_save:
return config
# helper fields for the admin
config["file_target_directory"] = os.path.join(backup_root, 'encrypted')
config["enc_pw_file"] = os.path.join(backup_root, 'secret_key.txt')
return config
def write_backup_config(env, newconfig):