etherpad: configure DB charset like docs recommend

[ansible.git] / roles / email / templates / dovecot / conf.d / 15-lda.conf

diff --git a/roles/email/templates/dovecot/conf.d/15-lda.conf b/roles/email/templates/dovecot/conf.d/15-lda.conf
index 7ded4cd6f2ffa48ec1fb78c599425d8dd188d7ac..ab3b8587a399a08f7dbd96db5469172c78f97883 100644 (file)
--- a/roles/email/templates/dovecot/conf.d/15-lda.conf
+++ b/roles/email/templates/dovecot/conf.d/15-lda.conf
@@ -4,7 +4,7 @@
 
 # Address to use when sending rejection mails.
 # Default is postmaster@<your domain>. %d expands to recipient domain.
-postmaster_address = {{postfix.dovecot.postmaster}}
+postmaster_address = {{postfix.postmaster}}
 
 # Hostname to use in various parts of sent mails (e.g. in Message-Id) and
 # in LMTP replies. Default is the system's real hostname@domain.
@@ -29,7 +29,7 @@ postmaster_address = {{postfix.dovecot.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.