wip

bundles/dovecot/files/dovecot.conf

@@ -116,7 +116,7 @@ plugin {
   sieve_plugins = sieve_imapsieve sieve_extprograms
   sieve_dir = /var/vmail/sieve/%u/
   sieve = /var/vmail/sieve/%u.sieve
-  sieve_pipe_bin_dir = /var/vmail/sieve/
+  sieve_pipe_bin_dir = /var/vmail/sieve/bin/
   sieve_extensions = +vnd.dovecot.pipe 
 
   sieve_after = /var/vmail/sieve/global/spam-to-folder.sieve

bundles/dovecot/files/learn-ham.sieve

@@ -4,4 +4,4 @@ if string "${mailbox}" "Trash" {
   stop;
 }
 
-pipe :copy "rspamd-learn-ham.sh";
+pipe :copy "learn-ham.sh";

bundles/dovecot/files/learn-spam.sieve

@@ -1,3 +1,3 @@
 require ["vnd.dovecot.pipe", "copy", "imapsieve"];
 
-pipe :copy "rspamd-learn-spam.sh";
+pipe :copy "learn-spam.sh";

bundles/dovecot/items.py

@@ -29,6 +29,10 @@ directories = {
         'owner': 'vmail',
         'group': 'vmail',
     },
+    '/var/vmail/sieve/bin': {
+        'owner': 'vmail',
+        'group': 'vmail',
+    },
 }
 
 files = {
@@ -71,12 +75,18 @@ files = {
     '/var/vmail/sieve/global/spam-to-folder.sieve': {
         'owner': 'vmail',
         'group': 'vmail',
+        'triggers': {
+            'svc_systemd:dovecot:restart',
+        },
     },
     '/var/vmail/sieve/global/learn-ham.sieve': {
         'owner': 'vmail',
         'group': 'vmail',
+        'triggers': {
+            'svc_systemd:dovecot:restart',
+        },
     },
-    '/var/vmail/sieve/global/learn-ham.sh': {
+    '/var/vmail/sieve/bin/learn-ham.sh': {
         'owner': 'vmail',
         'group': 'vmail',
         'mode': '550',
@@ -84,8 +94,11 @@ files = {
     '/var/vmail/sieve/global/learn-spam.sieve': {
         'owner': 'vmail',
         'group': 'vmail',
+        'triggers': {
+            'svc_systemd:dovecot:restart',
+        },
     },
-    '/var/vmail/sieve/global/learn-spam.sh': {
+    '/var/vmail/sieve/bin/learn-spam.sh': {
         'owner': 'vmail',
         'group': 'vmail',
         'mode': '550',