From 178449e8e360034456e333fc88a927f3c54a7839 Mon Sep 17 00:00:00 2001
From: Tobias Herre <tobias.herre@wikimedia.de>
Date: Mon, 16 Oct 2023 09:24:52 +0200
Subject: [PATCH] Uses library functions to install

---
 rspamd.cf | 47 +++++++++++------------------------------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/rspamd.cf b/rspamd.cf
index 7314401..5addda7 100644
--- a/rspamd.cf
+++ b/rspamd.cf
@@ -9,7 +9,7 @@ vars:
 		"local.d/milter_headers.conf",
 #		"local.d/actions.conf",
       		"local.d/worker-normal.inc",
-#		"local.d/worker-proxy.inc",
+		"local.d/worker-proxy.inc",
 #		"local.d/worker-controller.inc",
 #		"local.d/classifier-bayes.conf",
 #		"local.d/worker-fuzzy.inc",
@@ -29,53 +29,28 @@ vars:
 		"service_name" string => "rspamd";
 		"root_user" string => "root";
 		"root_group" string => "root";
-packages:
-	freebsd::
-		"$(rspamd.pkgs)"
-			policy => "present",
-			package_module => pkg,
-			handle => "rspamd_pkg_installed",
-			classes => if_repaired(rspamd_changed);
-	debian::
-		"$(rspamd.pkgs)"
-			policy => "present",
-			package_module => apt_get,
-			handle => "rspamd_pkg_installed",
-			classes => if_repaired(rspamd_changed);
-	fedora|centos::
-		"$(rspamd.pkgs)"
-			policy => "present",
-			package_module => yum,
-			handle => "rspamd_pkg_installed",
-			classes => if_repaired(rspamd_changed);
+
+
+methods:
+	"any" usebundle => wmde_install_packages(@(pkgs),"rspamd");
+	"any" usebundle => wmde_service("$(service_name)","rspamd_kept","rspamd_repaired"),
+		depends_on => {"rspamd_cfgs_done"};
 files:
 	"$(cfg_dir)/."
 	perms => uperm("$(root_user)","$(root_group)","755"),
-	depends_on => { "rspamd_pkg_installed" },
+	depends_on => { "rspamd_pkgs_installed" },
 	handle => "rspamd_cfg_dir_created";
 
 	"$(cfg_dir)/$(cfgfiles)"
 	create => "true",
 	edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/rspamd/$(cfgfiles).mustache",
 	template_method => "mustache",
-	perms => uperm("$(root_user)","$(root_group)","644"),
+	perms => m("644"),
 	template_data => bundlestate("$(this.bundle)"),
-	depends_on => { "rspamd_pkg_installed","rspamd_cfg_dir_created" },
-	classes => if_repaired(rspamd_restart),
+	depends_on => { "rspamd_pkgs_installed","rspamd_cfg_dir_created" },
+	classes => if_repaired(rspamd_repaired),
 	handle => "rspamd_cfgs_done";
 
-
-services:
-	"$(service_name)"
-	service_policy => "start",
-	depends_on => { "rspamd_cfgs_done" },
-	handle => "rspamd_running";
-
-	rspamd_restart::
-		"$(service_name)"
-		service_policy => "restart",
-		depends_on => { "rspamd_running", "rspamd_cfgs_done"};
-
 reports:
 #	"RSPAMD: $(cfgjs)";
 #	"RSJ: $(worker_normalx)";