commit a1a3f9f5ccd7e319d97ff5ce03d76b1d2e01ba71
from: gonzalo <gonzalo@gonzalo>
date: Thu May 02 06:50:28 2019 UTC

Sync with 6.5 fix some little things

Thanks Mulander

(https://gitlab.com/mulander/ansible-role-mailserver/commit/74ce629ed631156fe8fc81e61b8f68512f852985)

commit - cd37bb303ca385056144ee02820359a11663293b
commit + a1a3f9f5ccd7e319d97ff5ce03d76b1d2e01ba71
blob - 02d5c531cb7d2399589106b54a3c049b902783d0
blob + 1096e269be605809296d127e15bfe2ba3f3984de
--- templates/20-imap.conf.j2
+++ templates/20-imap.conf.j2
@@ -2,6 +2,6 @@
 #imap_client_workarounds = delay-newmail tb-extra-mailbox-sep tb-lsub-flags
 
 protocol imap {
-	mail_plugins = $mail_plugins
+	mail_plugins = $mail_plugins imap_sieve
 	mail_max_userip_connections = 20
 }
blob - b68ab1a89e1e51ecd9559dda8b5c97529a0513fc
blob + 2f8a6e1e24230c6c1c9d0b9d7d9fbb7a7425efd4
--- templates/90-plugin.conf.j2
+++ templates/90-plugin.conf.j2
@@ -1,12 +1,18 @@
 plugin {
-	#antispam_verbose_debug = 1
-	antispam_backend = mailtrain
-	antispam_spam    = Spam
-	antispam_trash   = Trash
-	antispam_mail_sendmail = /usr/local/bin/rspamc
-	antispam_mail_spam     = learn_spam
-	antispam_mail_notspam  = learn_ham
-	antispam_mail_sendmail_args = -h;localhost:11334;-P;q1
-	antispam_pipe_program_spam_arg = learn_spam
-	antispam_pipe_program_notspam_arg = learn_ham
+	sieve_plugins = sieve_imapsieve sieve_extprograms
+
+	# From elsewhere to Spam folder
+	imapsieve_mailbox1_name = Spam
+	imapsieve_mailbox1_causes = COPY
+	imapsieve_mailbox1_before = file:/usr/local/lib/dovecot/sieve/report-spam.sieve
+
+	# From Spam folder to elsewhere
+	imapsieve_mailbox2_name = *
+	imapsieve_mailbox2_from = Spam
+	imapsieve_mailbox2_causes = COPY
+	imapsieve_mailbox2_before = file:/usr/local/lib/dovecot/sieve/report-ham.sieve
+
+	sieve_pipe_bin_dir = /usr/local/lib/dovecot/sieve
+
+	sieve_global_extensions = +vnd.dovecot.pipe +vnd.dovecot.environment
 }