X-Git-Url: https://git.ralfj.de/ansible.git/blobdiff_plain/46730acf42cbde7d087b887eb78c3f06dc27d9ca..1eafda5361195d887ba73c0a88f033c91aa4ad23:/roles/email/templates/main.cf diff --git a/roles/email/templates/main.cf b/roles/email/templates/main.cf index 1049ed2..dc72a19 100644 --- a/roles/email/templates/main.cf +++ b/roles/email/templates/main.cf @@ -76,7 +76,7 @@ smtpd_sasl_path = private/auth # 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 %} @@ -107,11 +107,12 @@ proxy_read_maps = $virtual_alias_maps $virtual_mailbox_maps $smtpd_sender_login_ # 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 %} {% 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 %}