From 2773da5a125623cb10a4983394d5862bf8419427 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Mon, 16 Oct 2023 10:34:45 -0400
Subject: [PATCH] run the checkmine engine under master instead of minion

---
 salt/salt/engines/{ => master}/checkmine.py |  0
 salt/salt/files/engines.conf                |  2 +-
 salt/salt/master.sls                        | 19 +++++++++++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
 rename salt/salt/engines/{ => master}/checkmine.py (100%)

diff --git a/salt/salt/engines/checkmine.py b/salt/salt/engines/master/checkmine.py
similarity index 100%
rename from salt/salt/engines/checkmine.py
rename to salt/salt/engines/master/checkmine.py
diff --git a/salt/salt/files/engines.conf b/salt/salt/files/engines.conf
index 878aa9c49..7c43e99e1 100644
--- a/salt/salt/files/engines.conf
+++ b/salt/salt/files/engines.conf
@@ -3,4 +3,4 @@ engines_dirs:
 
 engines:
   - checkmine:
-      interval: 30
+      interval: 60
diff --git a/salt/salt/master.sls b/salt/salt/master.sls
index 1e0e6e303..182498678 100644
--- a/salt/salt/master.sls
+++ b/salt/salt/master.sls
@@ -20,17 +20,28 @@ salt_master_service:
 checkmine_engine:
   file.managed:
     - name: /etc/salt/engines/checkmine.py
-    - source: salt://salt/engines/checkmine.py
+    - source: salt://salt/engines/master/checkmine.py
     - makedirs: True
     - watch_in:
-        - service: salt_minion_service
+        - service: salt_master_service
 
-engines_config:
-  file.managed:
+# prior to 2.4.30 this engine ran on the manager with salt-minion
+# this has changed to running with the salt-master in 2.4.30
+remove_engines_config:
+  file.absent:
     - name: /etc/salt/minion.d/engines.conf
     - source: salt://salt/files/engines.conf
     - watch_in:
         - service: salt_minion_service
+    - order: last
+
+engines_config:
+  file.managed:
+    - name: /etc/salt/master.d/engines.conf
+    - source: salt://salt/files/engines.conf
+    - watch_in:
+        - service: salt_master_service
+    - order: last
 
 {% else %}