aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2017-02-24 20:17:13 +0000
committerMicah <micah@riseup.net>2017-02-24 20:17:13 +0000
commitcebe42c1bcf7ebfbb989c1b6a7d416d98c947e64 (patch)
tree3d9b36de8e8bbd5360a479cc60ba79ad7c4269b7
parent676234b71df6eccf2c6eb2b9c6109e0c3b43b858 (diff)
parent3ee64eb1cec8e5429425906e51d951a6462715e7 (diff)
downloadpuppet-postfix-cebe42c1bcf7ebfbb989c1b6a7d416d98c947e64.tar.gz
puppet-postfix-cebe42c1bcf7ebfbb989c1b6a7d416d98c947e64.tar.bz2
Merge branch 'bugfix/13-dovecot-lda-v2' into 'master'
master.cf: on Debian distros that ship dovecot 2.x, don't pass obsolete -n, but … See merge request !14
-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 397c089..e96f657 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 -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