diff --git a/defaults/ldap_relay_domains b/defaults/ldap_relay_domains index 0a2f4dd..8fe97eb 100644 --- a/defaults/ldap_relay_domains +++ b/defaults/ldap_relay_domains @@ -5,7 +5,6 @@ bind = no #bind_dn = cn=admin,dc=example,dc=com #bind_pw = password query_filter = (&(objectClass=inetLocalMailRecipient) (!(mailHost=@THIS_HOST@)) (dc=%s)) -#domain = example.com, hash:/etc/postfix/searchdomains #expansion_limit = 1 #recursion_limit = 1 #size_limit = $expansion_limit diff --git a/defaults/ldap_relay_recipient_maps b/defaults/ldap_relay_recipient_maps index cef84d1..1a90725 100644 --- a/defaults/ldap_relay_recipient_maps +++ b/defaults/ldap_relay_recipient_maps @@ -5,9 +5,8 @@ bind = no #bind_dn = cn=admin,dc=example,dc=com #bind_pw = password query_filter = (&(objectClass=inetLocalMailRecipient) (|(mail=%s)(mailLocalAddress=%s))) -#domain = example.com, hash:/etc/postfix/searchdomains #expansion_limit = 1 #recursion_limit = 1 #size_limit = $expansion_limit -result_attribute = entryUUID -# result_format = %s +result_attribute = mailHost +result_format = relay:[%s] diff --git a/defaults/ldap_transport_maps b/defaults/ldap_transport_maps new file mode 100644 index 0000000..3c0c501 --- /dev/null +++ b/defaults/ldap_transport_maps @@ -0,0 +1,12 @@ +server_host = ldap +search_base = @LDAP_SEARCH_BASE@ +version = 3 +bind = no +#bind_dn = cn=admin,dc=example,dc=com +#bind_pw = password +query_filter = (&(objectClass=inetLocalMailRecipient) (|(mail=%s)(mailLocalAddress=%s))) +#expansion_limit = 1 +#recursion_limit = 1 +#size_limit = $expansion_limit +result_attribute = mailHost +result_format = :[%s] diff --git a/defaults/ldap_virtual_alias_maps b/defaults/ldap_virtual_alias_maps index 45a7084..e69413f 100644 --- a/defaults/ldap_virtual_alias_maps +++ b/defaults/ldap_virtual_alias_maps @@ -5,7 +5,6 @@ bind = no #bind_dn = cn=admin,dc=example,dc=com #bind_pw = password query_filter = (&(objectClass=inetLocalMailRecipient) (mailHost=@THIS_HOST@) (|(mail=%s)(mailLocalAddress=%s))) -#domain = example.com, hash:/etc/postfix/searchdomains #expansion_limit = 1 #recursion_limit = 1 #size_limit = $expansion_limit diff --git a/defaults/ldap_virtual_mailbox_maps b/defaults/ldap_virtual_mailbox_maps index 7503792..9c806a3 100644 --- a/defaults/ldap_virtual_mailbox_maps +++ b/defaults/ldap_virtual_mailbox_maps @@ -5,7 +5,6 @@ bind = no #bind_dn = cn=admin,dc=example,dc=com #bind_pw = password query_filter = (&(objectClass=inetLocalMailRecipient) (|(mail=%s)(mailLocalAddress=%s))) -#domain = example.com, hash:/etc/postfix/searchdomains #expansion_limit = 1 #recursion_limit = 1 #size_limit = $expansion_limit diff --git a/include/01-custom.cf b/include/01-custom.cf index 4d6709d..66ec6d6 100644 --- a/include/01-custom.cf +++ b/include/01-custom.cf @@ -1,3 +1,4 @@ +smtp_host_lookup = native,dns message_size_limit = 25600000 queue_minfree = 51200000 smtpd_helo_required = yes diff --git a/include/40-relay.cf b/include/40-relay.cf index 1532b37..f836bbf 100644 --- a/include/40-relay.cf +++ b/include/40-relay.cf @@ -1,7 +1,7 @@ #relayhost = /etc/postfix/custom/relay_host relay_domains = lmdb:/etc/postfix/custom/relay_domains # ldap:/etc/postfix/custom/ldap_relay_domains relay_recipient_maps = lmdb:/etc/postfix/custom/relay_recipient_maps # ldap:/etc/postfix/custom/ldap_relay_recipient_maps -transport_maps = lmdb:/etc/postfix/custom/relay_domains +transport_maps = lmdb:/etc/postfix/custom/relay_domains # ldap:/etc/postfix/custom/ldap_transport_maps #transport_maps = $relay_domains #relay_transport = lmdb:/etc/postfix/custom/relay_domains <-- THIS DOESNT WORK? #relay_transport = relay:[c-8-2.leenooks.lan]:1025 <-- THIS DOES WORK