YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

indent ssow conf

Browse source
This commit is contained in:
Kay0u 2020-12-11 15:09:37 +01:00
parent 379c6e435c
commit c823f5ffd5
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/yunohost/app.py
View file

@ -1169,7 +1169,7 @@ def app_makedefault(operation_logger, app, domain=None):
ssowat_conf['redirected_urls'][domain + '/'] = app_domain + app_path 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') os.system('chmod 644 /etc/ssowat/conf.json.persistent')
logger.success(m18n.n('ssowat_conf_updated')) logger.success(m18n.n('ssowat_conf_updated'))
@ -1405,8 +1405,7 @@ def app_ssowatconf():
'permissions': permissions, 'permissions': permissions,
} }
with open('/etc/ssowat/conf.json', 'w+') as f: write_to_json('/etc/ssowat/conf.json', conf_dict, sort_keys=True, indent=4)
json.dump(conf_dict, f, sort_keys=True, indent=4)
from utils.legacy import translate_legacy_rules_in_ssowant_conf_json_persistent from utils.legacy import translate_legacy_rules_in_ssowant_conf_json_persistent
translate_legacy_rules_in_ssowant_conf_json_persistent() translate_legacy_rules_in_ssowant_conf_json_persistent()

2
src/yunohost/utils/legacy.py
View file

@ -269,6 +269,6 @@ def translate_legacy_rules_in_ssowant_conf_json_persistent():
"uris": protected_urls + persistent["permissions"].get("custom_protected", {}).get("uris", []), "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") logger.warning("Yunohost automatically translated some legacy rules in /etc/ssowat/conf.json.persistent to match the new permission system")