From 77e21170515b2f7e433ad7954414d9d579f64166 Mon Sep 17 00:00:00 2001 From: Wes Date: Wed, 8 May 2024 18:47:52 +0000 Subject: [PATCH] Account for 0 active rules and change watch --- salt/strelka/backend/enabled.sls | 2 ++ salt/strelka/config.sls | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/salt/strelka/backend/enabled.sls b/salt/strelka/backend/enabled.sls index 1de22f404..863115eda 100644 --- a/salt/strelka/backend/enabled.sls +++ b/salt/strelka/backend/enabled.sls @@ -42,6 +42,8 @@ strelka_backend: {% endfor %} {% endif %} - restart_policy: on-failure + - watch: + - file: /opt/so/conf/strelka/rules/compiled/* delete_so-strelka-backend_so-status.disabled: file.uncomment: diff --git a/salt/strelka/config.sls b/salt/strelka/config.sls index c65f9c2cb..4d3686c41 100644 --- a/salt/strelka/config.sls +++ b/salt/strelka/config.sls @@ -31,11 +31,13 @@ strelkarulesdir: {%- if grains.role in ['so-sensor', 'so-heavynode'] %} strelkasensorrules: - file.managed: - - name: /opt/so/conf/strelka/rules/compiled/rules.compiled - - source: salt://strelka/rules/compiled/rules.compiled + file.recurse: + - name: /opt/so/conf/strelka/rules/compiled/ + - source: salt://strelka/rules/compiled/ - user: 939 - group: 939 + - file_mode: 755 + - clean: True {%- endif %} strelkareposdir: