From b5b4f67a08feae51c6256936fbb99f001bdec8da Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Thu, 3 Oct 2024 17:30:58 +0200 Subject: [PATCH] chore(authelia): migrate away from deprecated config options --- roles/authelia/defaults/main.yml | 14 +++++++++++--- roles/authelia/vars/main.yml | 9 +++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/roles/authelia/defaults/main.yml b/roles/authelia/defaults/main.yml index 2d0d2de..58a4b6c 100644 --- a/roles/authelia/defaults/main.yml +++ b/roles/authelia/defaults/main.yml @@ -107,10 +107,18 @@ authelia_config_authentication_backend_ldap_additional_users_dn: "ou=users" authelia_config_authentication_backend_ldap_users_filter: "(&(|({username_attribute}={input})({mail_attribute}={input}))(objectClass=inetOrgPerson))" authelia_config_authentication_backend_ldap_additional_groups_dn: "ou=groups" authelia_config_authentication_backend_ldap_groups_filter: "(member={dn})" +authelia_config_authentication_backend_ldap_attributes_username: uid +authelia_config_authentication_backend_ldap_username_attribute: >-2 + {{ authelia_config_authentication_backend_ldap_attributes_username }} +authelia_config_authentication_backend_ldap_attributes_mail: mail +authelia_config_authentication_backend_ldap_mail_attribute: >-2 + {{ authelia_config_authentication_backend_ldap_attributes_mail }} +authelia_config_authentication_backend_ldap_attributes_display_name: displayName +authelia_config_authentication_backend_ldap_display_name_attribute: >-2 + {{ authelia_config_authentication_backend_ldap_attributes_display_name }} authelia_config_authentication_backend_ldap_group_name_attribute: cn -authelia_config_authentication_backend_ldap_username_attribute: uid -authelia_config_authentication_backend_ldap_mail_attribute: mail -authelia_config_authentication_backend_ldap_display_name_attribute: displayName +authelia_config_authentication_backend_ldap_attributes_group_name: >-2 + {{ authelia_config_authentication_backend_ldap_group_name_attribute }} authelia_config_authentication_backend_ldap_user: ~ authelia_config_authentication_backend_ldap_password: ~ authelia_config_authentication_backend_file_path: ~ diff --git a/roles/authelia/vars/main.yml b/roles/authelia/vars/main.yml index 0a9b9bb..331dd8b 100644 --- a/roles/authelia/vars/main.yml +++ b/roles/authelia/vars/main.yml @@ -130,10 +130,11 @@ authelia_config_authentication_backend_ldap: additional_groups_dn: "{{ authelia_config_authentication_backend_ldap_additional_groups_dn }}" users_filter: "{{ authelia_config_authentication_backend_ldap_users_filter }}" groups_filter: "{{ authelia_config_authentication_backend_ldap_groups_filter }}" - group_name_attribute: "{{ authelia_config_authentication_backend_ldap_group_name_attribute }}" - username_attribute: "{{ authelia_config_authentication_backend_ldap_username_attribute }}" - mail_attribute: "{{ authelia_config_authentication_backend_ldap_mail_attribute }}" - display_name_attribute: "{{ authelia_config_authentication_backend_ldap_display_name_attribute }}" + attributes: + username: "{{ authelia_config_authentication_backend_ldap_attributes_username }}" + mail: "{{ authelia_config_authentication_backend_ldap_attributes_mail }}" + display_name: "{{ authelia_config_authentication_backend_ldap_attributes_display_name }}" + group_name: "{{ authelia_config_authentication_backend_ldap_attributes_group_name }}" user: "{{ authelia_config_authentication_backend_ldap_user }}" password: "{{ authelia_config_authentication_backend_ldap_password }}" authelia_config_authentication_backend_file: