From: intrigeri <intrigeri@boum.org>
Date: Tue, 15 Mar 2016 10:51:46 +0000 (+0000)
Subject: master.cf: on Debian distros that ship dovecot 2.x, don't pass obsolete -n, but inste... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3ee64eb1cec8e5429425906e51d951a6462715e7;p=puppet-postfix.git

master.cf: on Debian distros that ship dovecot 2.x, don't pass obsolete -n, but instead -a "${recipient}" (#13).
---

diff --git a/templates/master.cf.debian-8.erb b/templates/master.cf.debian-8.erb
index 7b653fb..0c5c30c 100644
--- a/templates/master.cf.debian-8.erb
+++ b/templates/master.cf.debian-8.erb
@@ -135,7 +135,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 -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
+  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -m ${extension} -a "${recipient}"
 <% end %>
 <% if @use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe
diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb
index 7b653fb..0c5c30c 100644
--- a/templates/master.cf.debian-sid.erb
+++ b/templates/master.cf.debian-sid.erb
@@ -135,7 +135,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 -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
+  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -m ${extension} -a "${recipient}"
 <% end %>
 <% if @use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe