From 4e329359919367869ff8a0d3032e8823386863af Mon Sep 17 00:00:00 2001
From: Wes <wlambertts@gmail.com>
Date: Fri, 8 Mar 2024 16:24:37 +0000
Subject: [PATCH] Add Strelka config back

---
 salt/manager/init.sls           | 45 +++++++++++++++++++++++++++++++++
 salt/strelka/backend/config.sls | 10 ++++++++
 2 files changed, 55 insertions(+)

diff --git a/salt/manager/init.sls b/salt/manager/init.sls
index 51590a6ec..56e72c279 100644
--- a/salt/manager/init.sls
+++ b/salt/manager/init.sls
@@ -103,6 +103,51 @@ rules_dir:
     - group: socore
     - makedirs: True
 
+{% if STRELKAMERGED.rules.enabled %}
+ strelkarepos:
+   file.managed:
+     - name: /opt/so/conf/strelka/repos.txt
+     - source: salt://strelka/rules/repos.txt.jinja
+     - template: jinja
+     - defaults:
+         STRELKAREPOS: {{ STRELKAMERGED.rules.repos }}
+     - makedirs: True
+ strelka-yara-update:
+   {% if MANAGERMERGED.reposync.enabled and not GLOBALS.airgap %}
+   cron.present:
+   {% else %}
+   cron.absent:
+   {% endif %}
+     - user: socore
+     - name: '/usr/sbin/so-yara-update >> /opt/so/log/yarasync/yara-update.log 2>&1'
+     - identifier: strelka-yara-update
+     - hour: '7'
+     - minute: '1'
+ strelka-yara-download:
+   {% if MANAGERMERGED.reposync.enabled and not GLOBALS.airgap %}
+   cron.present:
+   {% else %}
+   cron.absent:
+   {% endif %}
+     - user: socore
+     - name: '/usr/sbin/so-yara-download >> /opt/so/log/yarasync/yara-download.log 2>&1'
+     - identifier: strelka-yara-download
+     - hour: '7'
+     - minute: '1'
+ {% if not GLOBALS.airgap %}
+ update_yara_rules:
+   cmd.run:
+     - name: /usr/sbin/so-yara-update
+     - onchanges:
+       - file: yara_update_scripts
+ download_yara_rules:
+   cmd.run:
+     - name: /usr/sbin/so-yara-download
+     - onchanges:
+       - file: yara_update_scripts
+ {% endif %}
+ {% endif %}
+
 {% else %}
 
 {{sls}}_state_not_allowed:
diff --git a/salt/strelka/backend/config.sls b/salt/strelka/backend/config.sls
index b39e06ac8..db18a68cc 100644
--- a/salt/strelka/backend/config.sls
+++ b/salt/strelka/backend/config.sls
@@ -50,6 +50,16 @@ backend_taste:
     - user: 939
     - group: 939
 
+{% if STRELKAMERGED.rules.enabled %}
+strelkarules:
+   file.recurse:
+     - name: /opt/so/conf/strelka/rules
+     - source: salt://strelka/rules
+     - user: 939
+     - group: 939
+     - clean: True
+{% endif %}
+
 {% else %}
 
 {{sls}}_state_not_allowed: