aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-07-18 09:20:09 +0000
committerintrigeri <intrigeri@boum.org>2015-07-18 09:20:09 +0000
commit59fc59053a92c7a32cc3f2d4da62280569902ce2 (patch)
treea9eaa8c5d4128c13d043dfda246038c930c3bb0e
parent78a1d1ae8f4063ac0557b012456feee166b303c2 (diff)
downloadpuppet-postfix-59fc59053a92c7a32cc3f2d4da62280569902ce2.tar.gz
puppet-postfix-59fc59053a92c7a32cc3f2d4da62280569902ce2.tar.bz2
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.
-rw-r--r--templates/master.cf.debian-sid.erb2
1 files changed, 1 insertions, 1 deletions
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