Geändert:

[ipfire-2.x.git] / config / postfix / master.cf

diff --git a/config/postfix/master.cf b/config/postfix/master.cf
index 3833ad6b4b8d83e8d53f6a4c7e1c17df2a71eea3..6397e441094d671f7942f242c25db8265bb824c3 100644 (file)
--- a/config/postfix/master.cf
+++ b/config/postfix/master.cf
@@ -60,11 +60,11 @@ maildrop  unix  -       n       n       -       -       pipe
 # The Cyrus deliver program has changed incompatibly, multiple times.
 #
 old-cyrus unix  -       n       n       -       -       pipe
-  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
+  flags= user=cyrus argv=/usr/cyrus/bin/deliver -r ${sender} -m ${extension} ${user}
 # Cyrus 2.1.5 (Amos Gouaux)
 # Also specify in main.cf: cyrus_destination_recipient_limit=1
 cyrus     unix  -       n       n       -       -       pipe
-  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
+  user=cyrus argv=/usr/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
 #
 # See the Postfix UUCP_README file for configuration details.
 #
@@ -77,3 +77,5 @@ ifmail    unix  -       n       n       -       -       pipe
   flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
 bsmtp     unix  -       n       n       -       -       pipe
   flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
+procmail  unix  -       n       n       -       20      pipe
+  flags=R user=cyrus argv=/usr/bin/procmail -r SENDER=${sender} -t -m USER=${user} EXTENSION=${extension} /etc/procmailrc