From ff1a903895b64ad60381e15115e9c3840629bf03 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 2 Nov 2022 12:58:31 -0400 Subject: [PATCH 1/3] Update init.sls --- salt/strelka/init.sls | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/salt/strelka/init.sls b/salt/strelka/init.sls index ff4727126..a9f9c14cb 100644 --- a/salt/strelka/init.sls +++ b/salt/strelka/init.sls @@ -24,6 +24,20 @@ {% import_yaml 'strelka/defaults.yaml' as strelka_config with context %} {% set IGNORELIST = salt['pillar.get']('strelka:ignore', strelka_config.strelka.ignore, merge=True, merge_nested_lists=True) %} +{% if grains['os'] != 'CentOS' %} +strelkapkgs: + pkg.installed: + - skip_suggestions: True + - pkgs: + - python3-watchdog +{% else %} +commonpkgs: + pkg.installed: + - skip_suggestions: True + - pkgs: + - securityonion-python36-watchdog +{% endif %} + # Strelka config strelkaconfdir: file.directory: From 4ac365e670b532870ba9e70a1fed73e65952cdf5 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 2 Nov 2022 12:59:17 -0400 Subject: [PATCH 2/3] Update init.sls --- salt/common/init.sls | 2 -- 1 file changed, 2 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 51903a2b6..94a1b4869 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -113,7 +113,6 @@ commonpkgs: - python3-mysqldb - python3-packaging - python3-lxml - - python3-watchdog - git - vim @@ -157,7 +156,6 @@ commonpkgs: - python36-mysql - python36-packaging - python36-lxml - - securityonion-python36-watchdog - yum-utils - device-mapper-persistent-data - lvm2 From c5bfe6ffdb9f2fc19e208a10153da75087350d46 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 2 Nov 2022 12:59:46 -0400 Subject: [PATCH 3/3] Update init.sls --- salt/strelka/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/strelka/init.sls b/salt/strelka/init.sls index a9f9c14cb..ec49787f7 100644 --- a/salt/strelka/init.sls +++ b/salt/strelka/init.sls @@ -31,7 +31,7 @@ strelkapkgs: - pkgs: - python3-watchdog {% else %} -commonpkgs: +strelkapkgs: pkg.installed: - skip_suggestions: True - pkgs: