X-Git-Url: https://git.ralfj.de/ansible.git/blobdiff_plain/f7b0d8fc034f2cfdc2a89d6d5857df258fe9fbc4..82c3952d5c4600c4c0ec7f8ab55f0dc96d750f4f:/roles/email/templates/main.cf?ds=sidebyside

diff --git a/roles/email/templates/main.cf b/roles/email/templates/main.cf
index a7313ae..7a735c2 100644
--- a/roles/email/templates/main.cf
+++ b/roles/email/templates/main.cf
@@ -13,7 +13,7 @@ local_recipient_maps = $alias_maps
 
 {% if 'letsencrypt' in group_names %}
 # TLS server parameters
-smtpd_tls_cert_file=/etc/ssl/mycerts/letsencrypt/live.crt+chain
+smtpd_tls_cert_file=/etc/ssl/mycerts/letsencrypt/live.crt
 smtpd_tls_key_file=/etc/ssl/private/letsencrypt/live.key
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtpd_tls_security_level = may
@@ -137,6 +137,6 @@ non_smtpd_milters = $smtpd_milters
 # misc
 smtpd_delay_reject = yes
 disable_vrfy_command = yes
-recipient_delimiter = +_
+recipient_delimiter = {{ postfix.recipient_delimiter | default("+") }}
 delay_warning_time = 4h
 message_size_limit = 21384000