99 lines
5.5 KiB
Plaintext
99 lines
5.5 KiB
Plaintext
$OpenBSD: patch-conf_master_cf,v 1.1 2011/03/09 10:47:32 sthen Exp $
|
|
--- conf/master.cf.orig Fri Dec 31 14:14:51 2010
|
|
+++ conf/master.cf Wed Mar 9 10:46:11 2011
|
|
@@ -8,49 +8,49 @@
|
|
# service type private unpriv chroot wakeup maxproc command + args
|
|
# (yes) (yes) (yes) (never) (100)
|
|
# ==========================================================================
|
|
-smtp inet n - n - - smtpd
|
|
-#smtp inet n - n - 1 postscreen
|
|
-#smtpd pass - - n - - smtpd
|
|
-#dnsblog unix - - n - 0 dnsblog
|
|
-#tlsproxy unix - - n - 0 tlsproxy
|
|
-#submission inet n - n - - smtpd
|
|
+smtp inet n - - - - smtpd
|
|
+#smtp inet n - - - 1 postscreen
|
|
+#smtpd pass - - - - - smtpd
|
|
+#dnsblog unix - - - - 0 dnsblog
|
|
+#tlsproxy unix - - - - 0 tlsproxy
|
|
+#submission inet n - - - - smtpd
|
|
# -o smtpd_tls_security_level=encrypt
|
|
# -o smtpd_sasl_auth_enable=yes
|
|
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
|
# -o milter_macro_daemon_name=ORIGINATING
|
|
-#smtps inet n - n - - smtpd
|
|
+#smtps inet n - - - - smtpd
|
|
# -o smtpd_tls_wrappermode=yes
|
|
# -o smtpd_sasl_auth_enable=yes
|
|
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
|
# -o milter_macro_daemon_name=ORIGINATING
|
|
-#628 inet n - n - - qmqpd
|
|
-pickup fifo n - n 60 1 pickup
|
|
-cleanup unix n - n - 0 cleanup
|
|
-qmgr fifo n - n 300 1 qmgr
|
|
-#qmgr fifo n - n 300 1 oqmgr
|
|
-tlsmgr unix - - n 1000? 1 tlsmgr
|
|
-rewrite unix - - n - - trivial-rewrite
|
|
-bounce unix - - n - 0 bounce
|
|
-defer unix - - n - 0 bounce
|
|
-trace unix - - n - 0 bounce
|
|
-verify unix - - n - 1 verify
|
|
-flush unix n - n 1000? 0 flush
|
|
+#628 inet n - - - - qmqpd
|
|
+pickup fifo n - - 60 1 pickup
|
|
+cleanup unix n - - - 0 cleanup
|
|
+qmgr fifo n - - 300 1 qmgr
|
|
+#qmgr fifo n - - 300 1 oqmgr
|
|
+tlsmgr unix - - - 1000? 1 tlsmgr
|
|
+rewrite unix - - - - - trivial-rewrite
|
|
+bounce unix - - - - 0 bounce
|
|
+defer unix - - - - 0 bounce
|
|
+trace unix - - - - 0 bounce
|
|
+verify unix - - - - 1 verify
|
|
+flush unix n - - 1000? 0 flush
|
|
proxymap unix - - n - - proxymap
|
|
proxywrite unix - - n - 1 proxymap
|
|
-smtp unix - - n - - smtp
|
|
+smtp unix - - - - - smtp
|
|
# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
|
|
-relay unix - - n - - smtp
|
|
+relay unix - - - - - smtp
|
|
-o smtp_fallback_relay=
|
|
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
|
|
-showq unix n - n - - showq
|
|
-error unix - - n - - error
|
|
-retry unix - - n - - error
|
|
-discard unix - - n - - discard
|
|
+showq unix n - - - - showq
|
|
+error unix - - - - - error
|
|
+retry unix - - - - - error
|
|
+discard unix - - - - - discard
|
|
local unix - n n - - local
|
|
virtual unix - n n - - virtual
|
|
-lmtp unix - - n - - lmtp
|
|
-anvil unix - - n - 1 anvil
|
|
-scache unix - - n - 1 scache
|
|
+lmtp unix - - - - - lmtp
|
|
+anvil unix - - - - 1 anvil
|
|
+scache unix - - - - 1 scache
|
|
#
|
|
# ====================================================================
|
|
# Interfaces to non-Postfix software. Be sure to examine the manual
|
|
@@ -84,14 +84,14 @@ scache unix - - n - 1
|
|
# 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=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
|
|
#
|
|
# ====================================================================
|
|
#
|
|
# Old example of delivery via Cyrus.
|
|
#
|
|
#old-cyrus unix - n n - - pipe
|
|
-# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
|
|
+# flags=R user=_cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
|
|
#
|
|
# ====================================================================
|
|
#
|