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 6da44d03c02b3c4da79b8eefc2328a3be6816484..ab3b8587a399a08f7dbd96db5469172c78f97883 100644 (file)
--- 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.
 #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.
 
 # 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 a7313ae9fda3f2b363b81fe53ca09acc11a39215..01c2185a57aec07d1dac12c152cd163cb2266abc 100644 (file)
--- 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
 # 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
 delay_warning_time = 4h
 message_size_limit = 21384000