summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-01-31 12:06:23 -0200
committerSilvio Rhatto <rhatto@riseup.net>2012-01-31 12:06:23 -0200
commit6a4499081347474db5829995cfb97118fb6f2257 (patch)
treef219003093107e5f394ace116f90bcf9a6f60f20
parenta1a1b11d8d58516f29c24066279d368c8ef79cc9 (diff)
Making dovecot honor recipient_deliver - http://wiki.dovecot.org/LDA/Postfix
-rw-r--r--templates/master.cf.debian-etch.erb2
-rw-r--r--templates/master.cf.debian-lenny.erb2
-rw-r--r--templates/master.cf.debian-squeeze.erb2
-rw-r--r--templates/master.cf.debian-wheezy.erb2
4 files changed, 4 insertions, 4 deletions
diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb
index 4b39f45..bc8ad64 100644
--- a/templates/master.cf.debian-etch.erb
+++ b/templates/master.cf.debian-etch.erb
@@ -96,7 +96,7 @@ amavis unix - - - - 2 smtp
<% end %>
<% if postfix_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 postfix_use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
diff --git a/templates/master.cf.debian-lenny.erb b/templates/master.cf.debian-lenny.erb
index 11d0fa0..9783e08 100644
--- a/templates/master.cf.debian-lenny.erb
+++ b/templates/master.cf.debian-lenny.erb
@@ -102,7 +102,7 @@ amavis unix - - - - 2 smtp
<% end %>
<% if postfix_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 postfix_use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
diff --git a/templates/master.cf.debian-squeeze.erb b/templates/master.cf.debian-squeeze.erb
index be86a08..0d383b9 100644
--- a/templates/master.cf.debian-squeeze.erb
+++ b/templates/master.cf.debian-squeeze.erb
@@ -125,7 +125,7 @@ amavis unix - - - - 2 smtp
<% end %>
<% if postfix_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 postfix_use_schleuder == 'yes' %>
schleuder unix - n n - - pipe
diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-wheezy.erb
index c71fbea..b2885ab 100644
--- a/templates/master.cf.debian-wheezy.erb
+++ b/templates/master.cf.debian-wheezy.erb
@@ -133,7 +133,7 @@ amavis unix - - - - 2 smtp
<% end %>
<% if postfix_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 postfix_use_schleuder == 'yes' %>
schleuder unix - n n - - pipe