From b8ffbfe27eae919750ef4d3facf02393d1004287 Mon Sep 17 00:00:00 2001 From: Elizabeth Alexander Hunt Date: Wed, 7 May 2025 18:10:57 -0700 Subject: .git was corrupted on the machine i worked on these many commits. so here it is all at once :P --- group_vars/mail.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'group_vars/mail.yml') diff --git a/group_vars/mail.yml b/group_vars/mail.yml index 1114ca8..0a964e2 100644 --- a/group_vars/mail.yml +++ b/group_vars/mail.yml @@ -16,15 +16,16 @@ ldap_server_host: "ldaps://{{ ldap_server }}:3636" ldap_search_base: "{{ 'dc=' ~ idm_domain | regex_replace('\\.', ',dc=') }}" ldap_bind_dn: "dn=token" -ldap_query_filter_user: "(&(class=account)(emailprimary=%s))" -ldap_query_filter_group: "(&(class=group)(mail=%s))" -ldap_query_filter_alias: "(&(class=account)(emailalternative=%s))" +ldap_memberof_query: "(memberof=mail)" +ldap_query_filter_user: "(&(class=account)(emailprimary=%s){{ ldap_memberof_query }})" +ldap_query_filter_group: "(&(class=group)(mail=%s){{ ldap_memberof_query }})" +ldap_query_filter_alias: "(&(class=account)(emailalternative=%s)(memberof=mail){{ ldap_memberof_query }})" ldap_query_filter_domain: "(mail=*@%s)" -ldap_query_filter_senders: "(&(class=account)(|(emailprimary=%s)(emailalternative=%s)))" +ldap_query_filter_senders: "(&(class=account)(|(emailprimary=%s)(emailalternative=%s)){{ ldap_memberof_query }})" dovecot_user_filter: > - (&(class=account)(name=%u) - (memberOf=cn=mail,{{ ldap_search_base }})) + (&(class=account)(name=%u){{ ldap_memberof_query }}) + dovecot_auth_bind_userdn: "name=%u,{{ ldap_search_base }}" roundcube_default_host: "ssl://{{ mail_domain }}" -- cgit v1.2.3-70-g09d2