forked from pool/postfix
6e63b0e03a
update postfix-master.cf.patch: recover lost submission, smtps sections OBS-URL: https://build.opensuse.org/request/show/486859 OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=259
114 lines
5.2 KiB
Diff
114 lines
5.2 KiB
Diff
Index: conf/master.cf
|
|
===================================================================
|
|
--- conf/master.cf.orig
|
|
+++ conf/master.cf
|
|
@@ -10,33 +10,39 @@
|
|
# (yes) (yes) (no) (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
|
|
#tlsproxy unix - - n - 0 tlsproxy
|
|
#submission inet n - n - - smtpd
|
|
-# -o syslog_name=postfix/submission
|
|
-# -o smtpd_tls_security_level=encrypt
|
|
-# -o smtpd_sasl_auth_enable=yes
|
|
-# -o smtpd_tls_auth_only=yes
|
|
-# -o smtpd_reject_unlisted_recipient=no
|
|
-# -o smtpd_client_restrictions=$mua_client_restrictions
|
|
-# -o smtpd_helo_restrictions=$mua_helo_restrictions
|
|
-# -o smtpd_sender_restrictions=$mua_sender_restrictions
|
|
-# -o smtpd_recipient_restrictions=
|
|
-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
|
|
-# -o milter_macro_daemon_name=ORIGINATING
|
|
+# -o syslog_name=postfix/submission
|
|
+# -o smtpd_tls_security_level=encrypt
|
|
+# -o smtpd_sasl_auth_enable=yes
|
|
+# -o smtpd_tls_auth_only=yes
|
|
+# -o smtpd_reject_unlisted_recipient=no
|
|
+# -o smtpd_client_restrictions=$mua_client_restrictions
|
|
+# -o smtpd_helo_restrictions=$mua_helo_restrictions
|
|
+# -o smtpd_sender_restrictions=$mua_sender_restrictions
|
|
+# -o smtpd_recipient_restrictions=
|
|
+# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
|
|
+# -o milter_macro_daemon_name=ORIGINATING
|
|
#smtps inet n - n - - smtpd
|
|
-# -o syslog_name=postfix/smtps
|
|
-# -o smtpd_tls_wrappermode=yes
|
|
-# -o smtpd_sasl_auth_enable=yes
|
|
-# -o smtpd_reject_unlisted_recipient=no
|
|
-# -o smtpd_client_restrictions=$mua_client_restrictions
|
|
-# -o smtpd_helo_restrictions=$mua_helo_restrictions
|
|
-# -o smtpd_sender_restrictions=$mua_sender_restrictions
|
|
-# -o smtpd_recipient_restrictions=
|
|
-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
|
|
-# -o milter_macro_daemon_name=ORIGINATING
|
|
+# -o syslog_name=postfix/smtps
|
|
+# -o smtpd_tls_wrappermode=yes
|
|
+# -o content_filter=smtp:[127.0.0.1]:10024
|
|
+# -o smtpd_sasl_auth_enable=yes
|
|
+# -o smtpd_reject_unlisted_recipient=no
|
|
+# -o smtpd_client_restrictions=$mua_client_restrictions
|
|
+# -o smtpd_helo_restrictions=$mua_helo_restrictions
|
|
+# -o smtpd_sender_restrictions=$mua_sender_restrictions
|
|
+# -o smtpd_recipient_restrictions=
|
|
+# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
|
|
+# -o milter_macro_daemon_name=ORIGINATING
|
|
#628 inet n - n - - qmqpd
|
|
pickup unix n - n 60 1 pickup
|
|
cleanup unix n - n - 0 cleanup
|
|
@@ -63,6 +69,27 @@ virtual unix - n n
|
|
lmtp unix - - n - - lmtp
|
|
anvil unix - - n - 1 anvil
|
|
scache unix - - n - 1 scache
|
|
+#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
|
|
+# -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_address_mappings
|
|
+# -o local_header_rewrite_clients=
|
|
+# -o local_recipient_maps=
|
|
+# -o relay_recipient_maps=
|
|
+
|
|
#
|
|
# ====================================================================
|
|
# Interfaces to non-Postfix software. Be sure to examine the manual
|
|
@@ -96,7 +123,7 @@ scache unix - - n
|
|
# 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}
|
|
#
|
|
# ====================================================================
|
|
#
|
|
@@ -129,3 +156,10 @@ scache unix - - n
|
|
#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}
|
|
+#
|
|
+#dovecot unix - n n - - pipe
|
|
+# flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}
|
|
+#
|