X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=master.cf;h=e04e05c027c78a3237169a12b88a430f83af5231;hb=06162c0801ba011bfa70b0a6cd2891d95a2f4f8d;hp=895bc1de2dcc221af1b249acf79362b28bf22937;hpb=1f6e7c5f03b276d6f364553537d7487f2c6fa14d;p=sysconfig%2Fpostfix.git

diff --git a/master.cf b/master.cf
index 895bc1d..e04e05c 100644
--- a/master.cf
+++ b/master.cf
@@ -8,12 +8,13 @@
 # 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
+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
+  -o smtpd_proxy_filter=127.0.0.1:10025
+  -o smtpd_client_connection_count_limit=15
 #smtps     inet  n       -       -       -       -       smtpd
 #  -o smtpd_tls_wrappermode=yes
 #  -o smtpd_sasl_auth_enable=yes
@@ -39,9 +40,12 @@ smtp      unix  -       -       -       -       -       smtp
 # 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
+# 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      inet  n       -       -       -        5      smtpd
         -o smtpd_proxy_filter=127.0.0.1:10025
-        -o smtpd_client_connection_count_limit=10
+        -o smtpd_client_connection_count_limit=15
 #
 # After-filter SMTP server. Receive mail from the content filter
 # on localhost port 10026.
@@ -56,6 +60,9 @@ smtp      inet  n       -       -       -       15      smtpd
         -o mynetworks=127.0.0.0/8
         -o receive_override_options=no_unknown_recipient_checks
 
+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=
@@ -69,6 +76,7 @@ virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       -       -       -       lmtp
 anvil     unix  -       -       -       -       1       anvil
 scache    unix  -       -       -       -       1       scache
+
 #
 # ====================================================================
 # Interfaces to non-Postfix software. Be sure to examine the manual