From 1185caea7943a86353540c868e1d7f7f41925297 Mon Sep 17 00:00:00 2001
From: Tube <7u83@mail.ru>
Date: Mon, 6 Nov 2023 09:25:21 +0100
Subject: [PATCH] Sieve scripts to learn spam on rspamd

---
 templates/dovecot/dovecot.conf.mustache | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/templates/dovecot/dovecot.conf.mustache b/templates/dovecot/dovecot.conf.mustache
index 2ad619a..a9210d9 100644
--- a/templates/dovecot/dovecot.conf.mustache
+++ b/templates/dovecot/dovecot.conf.mustache
@@ -112,7 +112,6 @@ namespace inbox {
 		auto = subscribe
 		special_use = \Trash
 	}
-
 	mailbox Sent {
 		auto = subscribe
 		special_use = \Sent
@@ -120,31 +119,37 @@ namespace inbox {
 }
 {{/vars.dovecot.cfg.default_imap_folders}}
 
-{{#vars.dovecot.cfg.rspamd_scripts}}
+
 	protocol imap {
 		mail_plugins = $mail_plugins imap_sieve
 	}
+
+{{#vars.dovecot.cfg.rspamd_scripts}}
 	plugin {
 		sieve_plugins = sieve_imapsieve sieve_extprograms 
 
 		# From elsewhere to Spam folder
 		imapsieve_mailbox1_name = Junk
 		imapsieve_mailbox1_causes = COPY
-		imapsieve_mailbox1_before = file:/etc/dovecot/rspamd/rspamd-learn-spam.sieve
+		imapsieve_mailbox1_before = file:{{vars.dovecot.cfg_dir}}/rspamd/rspamd-learn-spam.sieve
 
 		# From Spam folder to elsewhere
 		imapsieve_mailbox2_name = *
 		imapsieve_mailbox2_from = Junk
 		imapsieve_mailbox2_causes = COPY
-		imapsieve_mailbox2_before = file:/etc/dovecot/rspamd/rspamd-learn-ham.sieve
+		imapsieve_mailbox2_before = file:{{vars.dovecot.cfg_dir}}/rspamd/rspamd-learn-ham.sieve
 
-		sieve_pipe_bin_dir = /etc/dovecot/rspamd
+		sieve_pipe_bin_dir = {{vars.dovecot.cfg_dir}}/rspamd
 
 		sieve_global_extensions = +vnd.dovecot.pipe +vnd.dovecot.environment
 	}
 {{/vars.dovecot.cfg.rspamd_scripts}}
 
-
+{{#vars.dovecot.cfg.global_sieve_after}}
+                plugin {
+                        sieve_after = {{vars.dovecot.cfg_dir}}/rspamd/global_sieve_after.sieve
+                }
+{{/vars.dovecot.cfg.global_sieve_after}}
 
 
 {{vars.dovecot.cfg.raw}}