add sieve junk configuration

rootfs/etc/confd/templates/15-lda.conf.tmpl

@@ -4,5 +4,5 @@ lda_mailbox_autocreate = yes
 lda_mailbox_autosubscribe = yes
 
 protocol lda {
-  mail_plugins = $mail_plugins
+  mail_plugins = $mail_plugins sieve
 }

rootfs/etc/confd/templates/20-lmtp.conf.tmpl

@@ -1,3 +1,3 @@
 protocol lmtp {
-  mail_plugins = $mail_plugins
+  mail_plugins = $mail_plugins sieve
 }

rootfs/etc/confd/templates/90-sieve.conf.tmpl

@@ -1,8 +1,3 @@
-#protocol sieve {
-#  disable_plaintext_auth = no
-#}
-
-#plugin {
-#  sieve = bindir=~/.sieve-bin/
-#  sieve_after = /var/lib/vmail/sieve-after/
-#}
+plugin {
+  sieve_after = /var/lib/vmail/sieve-after/
+}

rootfs/etc/confd/templates/spam.sieve.tmpl

@@ -1,6 +1,6 @@
-require ["fileinto","mailbox"];
- 
-if header :contains "X-Spam-Flag" "YES" {
- fileinto :create "Junk";
+require ["fileinto"];
+
+if header :contains "X-Spam" "Yes" {
+ fileinto "Junk";
  stop;
 }

rootfs/etc/cont-init.d/02-sieve-rules

@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv sh
+
+s6-setuidgid vmail sievec /var/lib/vmail/sieve-after/spam.sieve