postfix: use default jinja combinator

[ansible.git] / roles / email / templates / main.cf

diff --git a/roles/email/templates/main.cf b/roles/email/templates/main.cf
index 4488ec4ee4c06fa2e1d4fbaa9567f3a2e6a294f5..dc72a19a73fbb65a39ab788a951964a4992b948a 100644 (file)
--- a/roles/email/templates/main.cf
+++ b/roles/email/templates/main.cf
@@ -76,40 +76,47 @@ smtpd_sasl_path = private/auth
 # allow relay for some TLS-authenticated clients
 smtpd_tls_ask_ccert = yes
 smtpd_tls_fingerprint_digest = sha1
 # allow relay for some TLS-authenticated clients
 smtpd_tls_ask_ccert = yes
 smtpd_tls_fingerprint_digest = sha1

-relay_clientcerts = hash:$config_directory/{{ postfix.relay_client_cert_whitelist }}
+relay_clientcerts = hash:$config_directory/relay_clientcerts

 {% endif %}
 
 {% if postfix.virtual_mailbox_domains is defined %}
 # setup virtual delivery domains, aliases and destinations
 {% endif %}
 
 {% if postfix.virtual_mailbox_domains is defined %}
 # setup virtual delivery domains, aliases and destinations

-virtual_mailbox_domains = {{ postfix.virtual_mailbox_domains }}
+virtual_mailbox_domains ={% for item in postfix.virtual_mailbox_domains %} {{item.domain}}{% endfor %}
+

 virtual_alias_maps = hash:$config_directory/virtual_alias_map
 virtual_alias_maps = hash:$config_directory/virtual_alias_map

-  {% if postfix.vmail_mysql_password is defined %}
+  {% if postfix.dovecot is defined %}

   proxy:mysql:$config_directory/mysql_vmail_aliases.cf
   {% endif %}
   proxy:mysql:$config_directory/mysql_vmail_aliases.cf
   {% endif %}

-#
+

 virtual_mailbox_maps =
 virtual_mailbox_maps =

-  {% if postfix.vmail_mysql_password is defined %}
+  {% if postfix.dovecot is defined %}

   proxy:mysql:$config_directory/mysql_vmail_users.cf
   {% endif %}
   {% if postfix.mailman | default(False) %}
   hash:/var/lib/mailman/data/virtual-mailman
   {% endif %}
   proxy:mysql:$config_directory/mysql_vmail_users.cf
   {% endif %}
   {% if postfix.mailman | default(False) %}
   hash:/var/lib/mailman/data/virtual-mailman
   {% endif %}

-#
+

 smtpd_sender_login_maps =
 smtpd_sender_login_maps =

-  {% if postfix.vmail_mysql_password is defined %}
+  {% if postfix.dovecot is defined %}

   proxy:mysql:$config_directory/mysql_vmail_users.cf
   proxy:mysql:$config_directory/mysql_vmail_senders.cf
   proxy:mysql:$config_directory/mysql_vmail_aliases.cf
   {% endif %}
   proxy:mysql:$config_directory/mysql_vmail_users.cf
   proxy:mysql:$config_directory/mysql_vmail_senders.cf
   proxy:mysql:$config_directory/mysql_vmail_aliases.cf
   {% endif %}

-#
+

 proxy_read_maps = $virtual_alias_maps $virtual_mailbox_maps $smtpd_sender_login_maps
 
 # setup mail routes for virtual mail: all mail ends up being forwarded somewhere
 virtual_transport = error
 proxy_read_maps = $virtual_alias_maps $virtual_mailbox_maps $smtpd_sender_login_maps
 
 # setup mail routes for virtual mail: all mail ends up being forwarded somewhere
 virtual_transport = error

-transport_maps = hash:/etc/postfix/transport_map
+transport_maps = hash:$config_directory/transport_map

 mailman_destination_recipient_limit = 1
 {% endif %}
 
 mailman_destination_recipient_limit = 1
 {% endif %}
 

+{% if postfix.smtp_outgoing is defined %}
+# send mail via specific IP
+default_transport = {{ postfix.default_smtp_outgoing }}
+sender_dependent_default_transport_maps = hash:$config_directory/sender_transport_map
+{% endif %}
+

 {% if postfix.opendkim is defined %}
 # DKIM & Milter
 milter_default_action = accept
 {% if postfix.opendkim is defined %}
 # DKIM & Milter
 milter_default_action = accept