From 577366e195d4c3f31d39db315fdce976c4dc37b6 Mon Sep 17 00:00:00 2001
From: Tube <7u83@mail.ru>
Date: Mon, 6 Nov 2023 09:19:42 +0100
Subject: [PATCH] Integrated globa sieve after script to move X-Spam yes to
 Junk

---
 dovecot.cf | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/dovecot.cf b/dovecot.cf
index 2bd0806..6ccc416 100644
--- a/dovecot.cf
+++ b/dovecot.cf
@@ -7,7 +7,7 @@ bundle agent dovecot(cfg)
 classes:
 	"use_ssl" expression => strcmp("$(cfg[ssl])","true");
 	"rspamd_scripts" expression => strcmp("$(cfg[rspamd_scripts])","true");
-
+	"global_sieve_after" expression => strcmp("$(cfg[global_sieve_after])","true");
 vars:
 	"imap_key" string => "$(cfg_dir)/private/imap.key";
 	"imap_cert" string => "$(cfg_dir)/private/imap.crt";
@@ -87,10 +87,10 @@ methods:
 	"any" usebundle => wmde_install_packages(@(pkgs),"dovecot");
 	"any" usebundle => wmde_service("$(service_name)","dovecot_kept","dovecot_repaired"),
 		depends_on => @(service_deps);
-	rspamd_scripts::
 	"any" usebundle => dovecot_install_rspamd_sieve_scripts("$(dovecot.cfg_dir)/rspamd"),
 		depends_on => {"dovecot_pkgs_installed"};
 
+
 files:	
 	"$(cfg_dir)/."
 	create => "true",
@@ -264,6 +264,21 @@ methods:
 		
 	) ,depends_on => {"dovecot_install_rspamd_sieve_scripts_dir_created"};
 
+
+        "any" usebundle => dovecot_install_sieve_script("$(target_dir)/global_sieve_after.sieve",
+        '        
+                require ["fileinto"];
+                if allof (header :contains "X-Spam" "Yes")
+	    	{  
+                        fileinto "Junk";
+                }  
+                           
+        ',"dovecot_global_sieve_after"),depends_on => {
+		"dovecot_install_rspamd_sieve_scripts_dir_created",
+		"dovecot_pkgs_installed"
+	};
+  
+
 files:
 
 	"$(target_dir)/rspamd-learn-ham.sh"