summaryrefslogtreecommitdiff
path: root/group_vars
diff options
context:
space:
mode:
authorElizabeth Hunt <me@liz.coffee>2025-05-02 01:16:14 -0700
committerElizabeth Hunt <me@liz.coffee>2025-05-02 18:37:37 -0700
commit01160ea57f87e1ca8799c55123e491ec7bac6c0c (patch)
treefd579e486012265071887772d466144c4a3ed054 /group_vars
parent2a8a33d28267f84e947834c1374a5e413f6d760e (diff)
downloadinfra-01160ea57f87e1ca8799c55123e491ec7bac6c0c.tar.gz
infra-01160ea57f87e1ca8799c55123e491ec7bac6c0c.zip
Fix some long-standing group issues and stuff
Diffstat (limited to 'group_vars')
-rw-r--r--group_vars/mail.yml10
1 files changed, 3 insertions, 7 deletions
diff --git a/group_vars/mail.yml b/group_vars/mail.yml
index c69cc82..1114ca8 100644
--- a/group_vars/mail.yml
+++ b/group_vars/mail.yml
@@ -17,14 +17,10 @@ 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=account)(emailprimary=%s))"
+ldap_query_filter_group: "(&(class=group)(mail=%s))"
ldap_query_filter_alias: "(&(class=account)(emailalternative=%s))"
-ldap_query_filter_domain: "(&(class=account)(emailprimary=%s))"
-ldap_query_filter_senders: "(&(class=account)(emailprimary=%s))"
-
-sasl_ldap_filter: >
- (&(|(name=%U)(emailprimary=%U))(class=account)
- (memberOf=cn=mail,{{ ldap_search_base }}))
+ldap_query_filter_domain: "(mail=*@%s)"
+ldap_query_filter_senders: "(&(class=account)(|(emailprimary=%s)(emailalternative=%s)))"
dovecot_user_filter: >
(&(class=account)(name=%u)