spam

bundles/dovecot/files/dovecot.conf

@@ -119,7 +119,7 @@ plugin {
   sieve_pipe_bin_dir = /var/vmail/sieve/
   sieve_extensions = +vnd.dovecot.pipe 
 
-  sieve_before = /var/vmail/sieve/global/spam-global.sieve
+  sieve_after = /var/vmail/sieve/global/spam-to-folder.sieve
 
   # From elsewhere to Spam folder
   imapsieve_mailbox1_name = Junk

bundles/dovecot/files/learn-ham.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/rspamc learn_ham

bundles/dovecot/files/learn-spam.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/rspamc learn_spam

bundles/dovecot/items.py

@@ -19,7 +19,16 @@ directories = {
     '/var/vmail': {
         'owner': 'vmail',
         'group': 'vmail',
-    }
+    },
+    '/var/vmail/sieve': {
+        'owner': 'vmail',
+        'group': 'vmail',
+    },
+    '/var/vmail/sieve/global': {
+        'purge': True,
+        'owner': 'vmail',
+        'group': 'vmail',
+    },
 }
 
 files = {
@@ -59,17 +68,27 @@ files = {
             'svc_systemd:dovecot:restart',
         },
     },
-    '/var/mail/vmail/sieve/global/learn-ham.sieve': {
-        'owner': 'nobody',
-        'group': 'nogroup',
+    '/var/vmail/sieve/global/spam-to-folder.sieve': {
+        'owner': 'vmail',
+        'group': 'vmail',
     },
-    '/var/mail/vmail/sieve/global/learn-spam.sieve': {
-        'owner': 'nobody',
-        'group': 'nogroup',
+    '/var/vmail/sieve/global/learn-ham.sieve': {
+        'owner': 'vmail',
+        'group': 'vmail',
     },
-    '/var/mail/vmail/sieve/global/spam-global.sieve': {
-        'owner': 'nobody',
-        'group': 'nogroup',
+    '/var/vmail/sieve/global/learn-ham.sh': {
+        'owner': 'vmail',
+        'group': 'vmail',
+        'mode': '550',
+    },
+    '/var/vmail/sieve/global/learn-spam.sieve': {
+        'owner': 'vmail',
+        'group': 'vmail',
+    },
+    '/var/vmail/sieve/global/learn-spam.sh': {
+        'owner': 'vmail',
+        'group': 'vmail',
+        'mode': '550',
     },
 }