mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-08-29 23:08:06 +02:00
Refactor LDAP variable schema to use top-level constant LDAP and nested ALL-CAPS keys.
- Converted group_vars/all/13_ldap.yml from lower-case to ALL-CAPS nested keys. - Updated all roles, tasks, templates, and filter_plugins to reference LDAP.* instead of ldap.*. - Fixed Keycloak JSON templates to properly quote Jinja variables. - Adjusted svc-db-openldap filter plugins and unit tests to handle new LDAP structure. - Updated integration test to only check uniqueness of TOP-LEVEL ALL-CAPS constants, ignoring nested keys. See: https://chatgpt.com/share/68b01017-efe0-800f-a508-7d7e2f1c8c8d
This commit is contained in:
@@ -32,17 +32,17 @@ plugin_configuration:
|
||||
-
|
||||
appid: "user_ldap"
|
||||
configkey: "s01ldap_base"
|
||||
configvalue: "{{ldap.dn.root}}"
|
||||
configvalue: "{{ LDAP.DN.ROOT }}"
|
||||
|
||||
-
|
||||
appid: "user_ldap"
|
||||
configkey: "s01ldap_base_groups"
|
||||
configvalue: "{{ldap.dn.root}}"
|
||||
configvalue: "{{ LDAP.DN.ROOT }}"
|
||||
|
||||
-
|
||||
appid: "user_ldap"
|
||||
configkey: "s01ldap_base_users"
|
||||
configvalue: "{{ldap.dn.ou.users}}"
|
||||
configvalue: "{{LDAP.DN.OU.USERS}}"
|
||||
|
||||
-
|
||||
appid: "user_ldap"
|
||||
@@ -67,7 +67,7 @@ plugin_configuration:
|
||||
-
|
||||
appid: "user_ldap"
|
||||
configkey: "s01ldap_dn"
|
||||
configvalue: "{{ldap.dn.administrator.data}}"
|
||||
configvalue: "{{LDAP.DN.ADMINISTRATOR.DATA}}"
|
||||
-
|
||||
appid: "user_ldap"
|
||||
configkey: "s01ldap_email_attr"
|
||||
@@ -103,11 +103,11 @@ plugin_configuration:
|
||||
-
|
||||
appid: "user_ldap"
|
||||
configkey: "s01ldap_host"
|
||||
configvalue: "{{ldap.server.domain}}"
|
||||
configvalue: "{{ LDAP.SERVER.DOMAIN }}"
|
||||
-
|
||||
appid: "user_ldap"
|
||||
configkey: "s01ldap_login_filter"
|
||||
configvalue: "{{ ldap.filters.users.login }}"
|
||||
configvalue: "{{ LDAP.FILTERS.USERS.LOGIN }}"
|
||||
-
|
||||
appid: "user_ldap"
|
||||
configkey: "s01ldap_login_filter_mode"
|
||||
@@ -165,7 +165,7 @@ plugin_configuration:
|
||||
configkey: "s01ldap_userlist_filter"
|
||||
configvalue: |-
|
||||
{% if applications | get_app_conf(application_id, 'plugins.user_ldap.user_directory.enabled', True) %}
|
||||
{{ ldap.filters.users.all }}
|
||||
{{ LDAP.FILTERS.USERS.ALL }}
|
||||
{% else %}
|
||||
()
|
||||
{% endif %}
|
||||
@@ -181,4 +181,4 @@ plugin_configuration:
|
||||
-
|
||||
appid: "user_ldap"
|
||||
configkey: "s01ldap_expert_username_attr"
|
||||
configvalue: "{{ldap.user.attributes.id}}"
|
||||
configvalue: "{{LDAP.USER.ATTRIBUTES.ID}}"
|
Reference in New Issue
Block a user