From 40c6b6aa6c1acf315fdd90ae9bdfcfe61117960d Mon Sep 17 00:00:00 2001
From: Tobias Herre <tobias.herre@wikimedia.de>
Date: Mon, 6 Nov 2023 21:42:41 +0100
Subject: [PATCH] restores password-has.txt if deleted

---
 rspamd.cf | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/rspamd.cf b/rspamd.cf
index 095c36c..903a065 100644
--- a/rspamd.cf
+++ b/rspamd.cf
@@ -69,14 +69,15 @@ files:
 		handle => "rspamd_password_created",
 		classes => if_repaired("rspamd_password_repaired");
 
-	rspamd_password_repaired::
-		"$(sys.workdir)/data/agent/rspamd/password-hash.txt"
-		content => execresult("$(rspamadm) pw -p $(cfg[password])","noshell"),
+methods:
+	runpw::
+		"any" usebundle => rspamd_create_password_hash, 
 		depends_on => {"rspamd_password_created"},
 		handle => "rspamd_password_hash_created";
-		
+
+	
 commands:
-	!rspamd_password_repaired::
+	!runpw::
 		"/usr/bin/true"
 		depends_on => {"rspamd_password_created"},
 		handle => "rspamd_password_hash_created",
@@ -109,6 +110,19 @@ reports:
 }
 
 
+bundle agent rspamd_create_password_hash
+{
+classes:
+	"no_hash_file" expression => not(fileexists("$(sys.workdir)/data/agent/rspamd/password-hash.txt"));
+
+files:
+	rspamd_password_repaired|no_hash_file::
+		"$(sys.workdir)/data/agent/rspamd/password-hash.txt"
+		content => execresult("$(rspamd.rspamadm) pw -p $(rspamd.cfg[password])","noshell"),
+		handle => "rspamd_password_hash_created";
+}
+
+
 bundle agent rspamd_install_yum_repo
 {
 classes: