From: intrigeri <intrigeri@boum.org>
Date: Sat, 18 Jul 2015 09:20:09 +0000 (+0000)
Subject: Debian sid's master.cf: merge custom dovecot/deliver options from the Jessie template.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=59fc59053a92c7a32cc3f2d4da62280569902ce2;p=puppet-postfix.git

Debian sid's master.cf: merge custom dovecot/deliver options from the Jessie template.

These changes were introduced in other templates in commit 6a44990, let's
propagate them to the sid template.
---

diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb
index c93fcfb..943581d 100644
--- a/templates/master.cf.debian-sid.erb
+++ b/templates/master.cf.debian-sid.erb
@@ -148,7 +148,7 @@ amavis unix - - - - 2 smtp
 <% end %>
 <% if use_dovecot_lda == 'yes' %>
 dovecot   unix  -       n       n       -       -       pipe
-  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}
+  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
 <% end %>
 <% if use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe