Add spamassassin support(?)

The master.cf change dates from Aug 22  2013, so I don't really remember...

diff --git a/main.cf b/main.cf
index 01a23ee4c8db40f3569f64b77166e9b5ab9756ea..53a062743ff00a9706794da2efbe3716e787d1eb 100644 (file)
--- a/main.cf
+++ b/main.cf
@@ -689,3 +689,4 @@ home_mailbox = .maildir/
 
 # 2005-01-19
 owner_request_special = no
+smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated permit_auth_destination reject_unauth_destination

diff --git a/master.cf b/master.cf
index 5c393965a65749c7b513afd3c142dee4efc729b5..a74a5f524c24b625099ea750285c362bd96b689d 100644 (file)
--- a/master.cf
+++ b/master.cf
@@ -8,11 +8,13 @@
 # service type  private unpriv  chroot  wakeup  maxproc command + args
 #               (yes)   (yes)   (yes)   (never) (100)
 # ==========================================================================
-#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