X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=master.cf;h=4cceeb2db488d18d5f631befafcd8590796a3b16;hb=1e88f4e82197f80a6b0f512b2d372d4faa504896;hp=1b1502031ba7f3977055d58af65210b807a3f9ef;hpb=bbb9f9abb36c288b3295de5f4c66207744c04ffa;p=sysconfig%2Fpostfix.git

diff --git a/master.cf b/master.cf
index 1b15020..4cceeb2 100644
--- a/master.cf
+++ b/master.cf
@@ -8,67 +8,75 @@
 # service type  private unpriv  chroot  wakeup  maxproc command + args
 #               (yes)   (yes)   (yes)   (never) (100)
 # ==========================================================================
-smtp      inet  n       -       -       -       -       smtpd
-#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       -       -       -       -       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       -       -       -       -       qmqpd
-pickup    fifo  n       -       -       60      1       pickup
-cleanup   unix  n       -       -       -       0       cleanup
+submission inet  n       -       y       -       -       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
+    -o content_filter=smtp:127.0.0.1:10025
+    -o smtpd_client_connection_count_limit=15
+pickup     fifo  n       -       y       60      1       pickup
+cleanup    unix  n       -       y       -       0       cleanup
 qmgr      fifo  n       -       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
+tlsmgr     unix  -       -       y       1000?   1       tlsmgr
+rewrite    unix  -       -       y       -       -       trivial-rewrite
+bounce     unix  -       -       y       -       0       bounce
+defer      unix  -       -       y       -       0       bounce
+trace      unix  -       -       y       -       0       bounce
+verify     unix  -       -       y       -       1       verify
+flush      unix  n       -       y       1000?   0       flush
 proxymap  unix  -       -       n       -       -       proxymap
 proxywrite unix -       -       n       -       1       proxymap
-smtp      unix  -       -       -       -       -       smtp
-smtp      inet  n       -       -       -       -       smtpd
+#smtp      inet  n       -       -       -       -       smtpd
+
 #
 # Before-filter SMTP server. Receive mail from the network and
 # pass it to the content filter on localhost port 10025.
 #
-#smtp      inet  n       -       -       -       15      smtpd
-#        -o smtpd_proxy_filter=127.0.0.1:10025
-#        -o smtpd_client_connection_count_limit=10
+# I *think* that the maxproc cap wants to be no more than the number
+# of spampd processes that can run, but I'm not really sure
+# (and hopefully it doesn't *really* matter)
+smtp       unix  -       -       y       -       -       smtp
 #
 # After-filter SMTP server. Receive mail from the content filter
 # on localhost port 10026.
 #
-#127.0.0.1:10026 inet n  -       n       -        -      smtpd
-#        -o smtpd_authorized_xforward_hosts=127.0.0.0/8
-#        -o smtpd_client_restrictions=
-#        -o smtpd_helo_restrictions=
-#        -o smtpd_sender_restrictions=
-#        -o smtpd_recipient_restrictions=permit_mynetworks,reject
-#        -o smtpd_data_restrictions=
-#        -o mynetworks=127.0.0.0/8
-#        -o receive_override_options=no_unknown_recipient_checks
+smtp       inet  n       -       y       -       5       smtpd
+    -o content_filter=smtp:127.0.0.1:10025
+    -o smtpd_client_connection_count_limit=15
+127.0.0.1:10026 inet n  -       n       -        -      smtpd
+        -o smtpd_authorized_xforward_hosts=127.0.0.0/8
+        -o smtpd_client_restrictions=
+        -o smtpd_helo_restrictions=
+        -o smtpd_sender_restrictions=
+        -o smtpd_recipient_restrictions=permit_mynetworks,reject
+        -o smtpd_data_restrictions=
+        -o mynetworks=127.0.0.0/8
+        -o receive_override_options=no_unknown_recipient_checks,no_milters
+
+#smtp-forward    unix  -  -   n       -       -       smtp -o smtp_bind_address=18.102.208.11
+#smtp-local      unix  -  -   n       -       -       smtp -o smtp_bind_address=18.102.208.44
 
 # When relaying mail as backup MX, disable fallback_relay to avoid MX loops
-relay     unix  -       -       -       -       -       smtp
-	-o smtp_fallback_relay=
 #       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
-showq     unix  n       -       -       -       -       showq
-error     unix  -       -       -       -       -       error
-retry     unix  -       -       -       -       -       error
-discard   unix  -       -       -       -       -       discard
+relay      unix  -       -       y       -       -       smtp
+    -o smtp_fallback_relay=
+showq      unix  n       -       y       -       -       showq
+error      unix  -       -       y       -       -       error
+retry      unix  -       -       y       -       -       error
+discard    unix  -       -       y       -       -       discard
 local     unix  -       n       n       -       -       local
 virtual   unix  -       n       n       -       -       virtual
-lmtp      unix  -       -       -       -       -       lmtp
-anvil     unix  -       -       -       -       1       anvil
-scache    unix  -       -       -       -       1       scache
+lmtp       unix  -       -       y       -       -       lmtp
+anvil      unix  -       -       y       -       1       anvil
+
 #
 # ====================================================================
 # Interfaces to non-Postfix software. Be sure to examine the manual
@@ -82,6 +90,7 @@ scache    unix  -       -       -       -       1       scache
 # maildrop. See the Postfix MAILDROP_README file for details.
 # Also specify in main.cf: maildrop_destination_recipient_limit=1
 #
+scache     unix  -       -       y       -       1       scache
 maildrop  unix  -       n       n       -       -       pipe
   flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
 #