aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-03-15 10:51:46 +0000
committerintrigeri <intrigeri@boum.org>2016-03-15 10:52:43 +0000
commit3ee64eb1cec8e5429425906e51d951a6462715e7 (patch)
treea19993d6ccdb517a8585a764b39f12a0cc520be7
parent969076a813b88dafd222c413bf6fbabab837eafb (diff)
downloadpuppet-postfix-3ee64eb1cec8e5429425906e51d951a6462715e7.tar.gz
puppet-postfix-3ee64eb1cec8e5429425906e51d951a6462715e7.tar.bz2
master.cf: on Debian distros that ship dovecot 2.x, don't pass obsolete -n, but instead -a "${recipient}" (#13).
-rw-r--r--templates/master.cf.debian-8.erb2
-rw-r--r--templates/master.cf.debian-sid.erb2
2 files changed, 2 insertions, 2 deletions
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