aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Joe Banks <[email protected]>2024-08-02 20:56:11 +0100
committerGravatar jchristgit <[email protected]>2024-08-03 10:03:41 +0200
commitb9e71ff5e13af95b55eafcd1a30304a0180b09ef (patch)
treea1f29e502e2843cc5a5e3cd951d142b56d216ef7
parentConfigure Postfix to accept mail for pydis.com and pythondiscord.com (diff)
Update LDAP Postfix lookups to support multiple domains
-rw-r--r--ansible/roles/postfix/templates/ldap/ldap-registeredaddress.cf.j22
-rw-r--r--ansible/roles/postfix/templates/ldap/ldap-relay-recipients.cf.j22
-rw-r--r--ansible/roles/postfix/templates/ldap/ldap-uid.cf.j22
3 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/postfix/templates/ldap/ldap-registeredaddress.cf.j2 b/ansible/roles/postfix/templates/ldap/ldap-registeredaddress.cf.j2
index 99fc105..2089b95 100644
--- a/ansible/roles/postfix/templates/ldap/ldap-registeredaddress.cf.j2
+++ b/ansible/roles/postfix/templates/ldap/ldap-registeredaddress.cf.j2
@@ -5,7 +5,7 @@ bind = yes
bind_dn = {{ postfix_bind_user }}
bind_pw = {{ postfix_bind_password }}
search_base = {{ postfix_bind_search_base }}
-query_filter = (mail=%s)
+query_filter = (mail=%u@{{ postfix_mailname }})
result_attribute = registeredAddress
result_format = %s
version = 3
diff --git a/ansible/roles/postfix/templates/ldap/ldap-relay-recipients.cf.j2 b/ansible/roles/postfix/templates/ldap/ldap-relay-recipients.cf.j2
index d2b7f29..8a7a4e8 100644
--- a/ansible/roles/postfix/templates/ldap/ldap-relay-recipients.cf.j2
+++ b/ansible/roles/postfix/templates/ldap/ldap-relay-recipients.cf.j2
@@ -5,7 +5,7 @@ bind = yes
bind_dn = {{ postfix_bind_user }}
bind_pw = {{ postfix_bind_password }}
search_base = {{ postfix_bind_search_base }}
-query_filter = (mail=%s)
+query_filter = (mail=%u@{{ postfix_mailname }})
result_attribute = mail
result_format = %s
version = 3
diff --git a/ansible/roles/postfix/templates/ldap/ldap-uid.cf.j2 b/ansible/roles/postfix/templates/ldap/ldap-uid.cf.j2
index 638e23a..072edbe 100644
--- a/ansible/roles/postfix/templates/ldap/ldap-uid.cf.j2
+++ b/ansible/roles/postfix/templates/ldap/ldap-uid.cf.j2
@@ -5,7 +5,7 @@ bind = yes
bind_dn = {{ postfix_bind_user }}
bind_pw = {{ postfix_bind_password }}
search_base = {{ postfix_bind_search_base }}
-query_filter = (mail=%s)
+query_filter = (mail=%u@{{ postfix_mailname }})
result_attribute = uid
result_format = %s@localhost
version = 3