Misc fixes @_@⁴

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"

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

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)