From: Ralf Jung <post@ralfj.de>
Date: Mon, 3 Jun 2019 11:28:07 +0000 (+0200)
Subject: sync recipient_delimeter between dovecot and postfix
X-Git-Url: https://git.ralfj.de/ansible.git/commitdiff_plain/02ac218b8d01b532c9ea483ef38d688ff923c58c

sync recipient_delimeter between dovecot and postfix
---

diff --git a/roles/email/templates/dovecot/conf.d/15-lda.conf b/roles/email/templates/dovecot/conf.d/15-lda.conf
index 6da44d0..ab3b858 100644
--- a/roles/email/templates/dovecot/conf.d/15-lda.conf
+++ b/roles/email/templates/dovecot/conf.d/15-lda.conf
@@ -29,7 +29,7 @@ postmaster_address = {{postfix.postmaster}}
 #rejection_reason = Your message to <%t> was automatically rejected:%n%r
 
 # Delimiter character between local-part and detail in email address.
-#recipient_delimiter = +
+recipient_delimiter = {{ postfix.recipient_delimiter | default("+") }}
 
 # Header where the original recipient address (SMTP's RCPT TO: address) is taken
 # from if not available elsewhere. With dovecot-lda -a parameter overrides this.
diff --git a/roles/email/templates/main.cf b/roles/email/templates/main.cf
index a7313ae..01c2185 100644
--- a/roles/email/templates/main.cf
+++ b/roles/email/templates/main.cf
@@ -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