add spamass-milter

rootfs/etc/confd/templates/main.cf.tmpl

@@ -48,11 +48,9 @@ smtpd_sasl_auth_enable = yes
 smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination
 
 smtpd_milters =
-    unix:/var/run/spamass-milter/spamass.sock
 non_smtpd_milters = $smtpd_milters
 milter_default_action = accept
 milter_macro_daemon_name = ORIGINATING
-milter_connect_macros = "i j {daemon_name} v {if_name} _"
 
 message_size_limit = {{getenv "MESSAGESIZELIMIT"}}
 

rootfs/etc/confd/templates/master.cf.tmpl

@@ -1,8 +1,9 @@
 submission  inet  n  - - - -  smtpd
   -o syslog_name=postfix/submission
   -o smtpd_tls_security_level=encrypt
+  -o content_filter=spamfilter
 
-smtp      inet  n       -       n       -       -       smtpd
+smtp      inet  n       -       n       -       -       smtpd -o content_filter=spamfilter
 pickup    unix  n       -       n       60      1       pickup
 cleanup   unix  n       -       n       -       0       cleanup
 qmgr      unix  n       -       n       300     1       qmgr
@@ -26,3 +27,7 @@ virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       n       -       -       lmtp
 anvil     unix  -       -       n       -       1       anvil
 scache    unix  -       -       n       -       1       scache
+
+spamfilter unix  -       n       n       -       -       pipe
+   flags=Rq user=postfix argv=/usr/bin/spamfilter ${sender} ${recipient}
+   

rootfs/etc/services.d/spamass-milter/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-s6-setuidgid postfix spamass-milter -p /var/run/spamass-milter/spamass.sock -- -d spamassassin

rootfs/usr/bin/spamfilter

@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv sh
+
+SENDMAIL=/usr/sbin/sendmail
+SPAMASSASSIN=/usr/bin/spamc
+
+${SPAMASSASSIN} -u $1 -d spamassassin | ${SENDMAIL} -oi -f $1 $2
+
+exit $?