From c823f5ffd5f3100f0ac936ebb550b3256de4a90b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 11 Dec 2020 15:09:37 +0100 Subject: [PATCH] indent ssow conf --- src/yunohost/app.py | 5 ++--- src/yunohost/utils/legacy.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 71aaca316..2ccd026f5 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -1169,7 +1169,7 @@ def app_makedefault(operation_logger, app, domain=None): ssowat_conf['redirected_urls'][domain + '/'] = app_domain + app_path - write_to_json('/etc/ssowat/conf.json.persistent', ssowat_conf) + write_to_json('/etc/ssowat/conf.json.persistent', ssowat_conf, sort_keys=True, indent=4) os.system('chmod 644 /etc/ssowat/conf.json.persistent') logger.success(m18n.n('ssowat_conf_updated')) @@ -1405,8 +1405,7 @@ def app_ssowatconf(): 'permissions': permissions, } - with open('/etc/ssowat/conf.json', 'w+') as f: - json.dump(conf_dict, f, sort_keys=True, indent=4) + write_to_json('/etc/ssowat/conf.json', conf_dict, sort_keys=True, indent=4) from utils.legacy import translate_legacy_rules_in_ssowant_conf_json_persistent translate_legacy_rules_in_ssowant_conf_json_persistent() diff --git a/src/yunohost/utils/legacy.py b/src/yunohost/utils/legacy.py index a90b9fd74..b8b44135d 100644 --- a/src/yunohost/utils/legacy.py +++ b/src/yunohost/utils/legacy.py @@ -269,6 +269,6 @@ def translate_legacy_rules_in_ssowant_conf_json_persistent(): "uris": protected_urls + persistent["permissions"].get("custom_protected", {}).get("uris", []), } - write_to_json("/etc/ssowat/conf.json.persistent", persistent) + write_to_json("/etc/ssowat/conf.json.persistent", persistent, sort_keys=True, indent=4) logger.warning("Yunohost automatically translated some legacy rules in /etc/ssowat/conf.json.persistent to match the new permission system")