From fd577a08287319e71168e3063332d20f30d2b7de Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 2 Dec 2024 18:00:04 +0100 Subject: [PATCH] =?UTF-8?q?Misc=20fixes=20@=5F@=E2=81=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hooks/conf_regen/06-slapd | 5 ++++- src/app.py | 5 +++-- src/regenconf.py | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hooks/conf_regen/06-slapd b/hooks/conf_regen/06-slapd index e7be7ba10a..77cde36e44 100755 --- a/hooks/conf_regen/06-slapd +++ b/hooks/conf_regen/06-slapd @@ -144,7 +144,10 @@ objectClass: top" nscd -i group fi - [ -z "$regen_conf_files" ] && exit 0 + if [ -z "$regen_conf_files" ] && [ $FORCE == "false" ] + then + exit 0 + fi # regenerate LDAP config directory from slapd.conf echo "Regenerate LDAP config directory from config.ldif" diff --git a/src/app.py b/src/app.py index 9d29e4c4d0..122284a006 100644 --- a/src/app.py +++ b/src/app.py @@ -1678,10 +1678,11 @@ def app_ssowatconf(): # New permission system for perm_name, perm_info in all_permissions.items(): + uris = ( [] - + ([perm_info["url"]] if perm_info["url"] else []) - + perm_info["additional_urls"] + + ([perm_info["url"]] if perm_info.get("url") else []) + + perm_info.get("additional_urls", []) ) # Ignore permissions for which there's no url defined diff --git a/src/regenconf.py b/src/regenconf.py index 05a6edf815..e502953354 100644 --- a/src/regenconf.py +++ b/src/regenconf.py @@ -147,6 +147,7 @@ def _pre_call(name, priority, path, args): # so that scripts dont have to call 'yunohost settings get' manually # which is painful performance-wise env["YNH_SETTINGS"] = json.dumps(settings_get("", export=True)) + env["FORCE"] = "true" if force else "false" pre_result = hook_callback("conf_regen", names, pre_callback=_pre_call, env=env)