Commit Diff


commit - a5a50728d8bd7c57b23daef08e577d39c5c1a6da
commit + c57be6e1df69dcec98fd8e16badfcd037e026d41
blob - 9385430ff07abef5cb1a836da61a743e31fc4b37
blob + fbbdddd00d7ace7bb41b9d45f4f2d32bad660a85
--- install.sh
+++ install.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-pkg_add opensmtpd-extras dovecot
+pkg_add opensmtpd-extras p5-Mail-SpamAssassin dovecot
 
-rcctl enable httpd smtpd dovecot
+rcctl enable spamassassin httpd smtpd dovecot
 
 mkdir -p /mail/box /mail/lib
 
@@ -18,4 +18,4 @@ cp dovecot.conf /etc/dovecot/local.conf
 
 sqlite3 /mail/lib/accounts.db < init.sql
 
-rcctl restart httpd smtpd dovecot
+rcctl restart spamassassin httpd smtpd dovecot
blob - 6e522020b1447c24755b55c078df3caacc137cbb
blob + a4383305f1d2ac91b865f0b9bd6b21bf212f8ecc
--- smtpd.conf
+++ smtpd.conf
@@ -12,7 +12,8 @@ match from local for local action "local_mail"
 
 pki mail.srcbeat.com cert "/etc/ssl/mail.srcbeat.com.fullchain.pem"
 pki mail.srcbeat.com key "/etc/ssl/private/mail.srcbeat.com.key"
-listen on egress tls pki mail.srcbeat.com
+filter "spamassassin" proc-exec "filter-spamassassin"
+listen on egress tls pki mail.srcbeat.com filter "spamassassin"
 listen on egress smtps pki mail.srcbeat.com auth <accounts>
 
 action "deliver" maildir "/mail/box/%{dest.domain}/%{dest.user}/Maildir" virtual <aliases>