2011-05-18 00:52:01 +02:00
|
|
|
diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf
|
|
|
|
|
--- postfix-2.8.3-orig/conf/master.cf 2010-12-31 15:14:51.000000000 +0100
|
2011-07-01 14:45:31 +02:00
|
|
|
+++ postfix-2.8.3/conf/master.cf 2011-07-01 14:30:23.000000000 +0200
|
2011-05-18 00:52:01 +02:00
|
|
|
@@ -9,6 +9,11 @@
|
|
|
|
|
# (yes) (yes) (yes) (never) (100)
|
|
|
|
|
# ==========================================================================
|
|
|
|
|
smtp inet n - n - - smtpd
|
|
|
|
|
+#amavis unix - - n - 4 smtp
|
|
|
|
|
+# -o smtp_data_done_timeout=1200
|
|
|
|
|
+# -o smtp_send_xforward_command=yes
|
|
|
|
|
+# -o disable_dns_lookups=yes
|
|
|
|
|
+# -o max_use=20
|
|
|
|
|
#smtp inet n - n - 1 postscreen
|
|
|
|
|
#smtpd pass - - n - - smtpd
|
|
|
|
|
#dnsblog unix - - n - 0 dnsblog
|
|
|
|
|
@@ -50,6 +55,26 @@
|
|
|
|
|
virtual unix - n n - - virtual
|
|
|
|
|
lmtp unix - - n - - lmtp
|
|
|
|
|
anvil unix - - n - 1 anvil
|
|
|
|
|
+#localhost:10025 inet n - n - - smtpd
|
|
|
|
|
+# -o content_filter=
|
|
|
|
|
+# -o smtpd_delay_reject=no
|
|
|
|
|
+# -o smtpd_client_restrictions=permit_mynetworks,reject
|
|
|
|
|
+# -o smtpd_helo_restrictions=
|
|
|
|
|
+# -o smtpd_sender_restrictions=
|
|
|
|
|
+# -o smtpd_recipient_restrictions=permit_mynetworks,reject
|
|
|
|
|
+# -o smtpd_data_restrictions=reject_unauth_pipelining
|
|
|
|
|
+# -o smtpd_end_of_data_restrictions=
|
|
|
|
|
+# -o smtpd_restriction_classes=
|
|
|
|
|
+# -o mynetworks=127.0.0.0/8
|
|
|
|
|
+# -o smtpd_error_sleep_time=0
|
|
|
|
|
+# -o smtpd_soft_error_limit=1001
|
|
|
|
|
+# -o smtpd_hard_error_limit=1000
|
|
|
|
|
+# -o smtpd_client_connection_count_limit=0
|
|
|
|
|
+# -o smtpd_client_connection_rate_limit=0
|
2011-07-01 14:45:31 +02:00
|
|
|
+# -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_address_mappings
|
2011-05-18 00:52:01 +02:00
|
|
|
+# -o local_header_rewrite_clients=
|
|
|
|
|
+# -o local_recipient_maps=
|
|
|
|
|
+# -o relay_recipient_maps=
|
|
|
|
|
scache unix - - n - 1 scache
|
|
|
|
|
#
|
|
|
|
|
# ====================================================================
|
|
|
|
|
@@ -84,7 +109,7 @@
|
|
|
|
|
# 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/lib/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
|
|
|
|
|
#
|
|
|
|
|
# ====================================================================
|
|
|
|
|
#
|
|
|
|
|
@@ -117,3 +142,7 @@
|
|
|
|
|
#mailman unix - n n - - pipe
|
|
|
|
|
# flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
|
|
|
|
|
# ${nexthop} ${user}
|
|
|
|
|
+#
|
|
|
|
|
+#procmail unix - n n - - pipe
|
|
|
|
|
+# flags=R user=nobody argv=/usr/bin/procmail -t -m /etc/procmailrc ${sender} ${recipient}
|
|
|
|
|
+#
|
