From 5a59975cb88abeeaed460c7f00780a8d0fc5b774 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 31 Jul 2023 10:14:31 -0400 Subject: [PATCH 1/3] Update so-yara-download --- salt/strelka/tools/sbin_jinja/so-yara-download | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/strelka/tools/sbin_jinja/so-yara-download b/salt/strelka/tools/sbin_jinja/so-yara-download index 9ec6fa41f..a8087173c 100644 --- a/salt/strelka/tools/sbin_jinja/so-yara-download +++ b/salt/strelka/tools/sbin_jinja/so-yara-download @@ -8,7 +8,7 @@ NOROOT=1 {%- if proxy %} export http_proxy={{ proxy }} export https_proxy={{ proxy }} -export no_proxy= salt['pillar.get']('manager:no_proxy') +export no_proxy=salt['pillar.get']('manager:no_proxy') {%- endif %} mkdir -p /tmp/yara From 4939447764c085c94fe82884b78690cce6e38c78 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 31 Jul 2023 10:16:37 -0400 Subject: [PATCH 2/3] Update so-yara-download --- salt/manager/tools/sbin_jinja/so-yara-download | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin_jinja/so-yara-download b/salt/manager/tools/sbin_jinja/so-yara-download index adfb8c529..e9b991b6c 100644 --- a/salt/manager/tools/sbin_jinja/so-yara-download +++ b/salt/manager/tools/sbin_jinja/so-yara-download @@ -8,7 +8,7 @@ NOROOT=1 {%- if proxy %} export http_proxy={{ proxy }} export https_proxy={{ proxy }} -export no_proxy= salt['pillar.get']('manager:no_proxy') +export no_proxy=salt['pillar.get']('manager:no_proxy') {%- endif %} repos="/opt/so/conf/strelka/repos.txt" From f867be9e04ec246951f953d9538f22d049d45138 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 31 Jul 2023 10:19:51 -0400 Subject: [PATCH 3/3] Fix no_proxy --- salt/idstools/tools/sbin_jinja/so-rule-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/idstools/tools/sbin_jinja/so-rule-update b/salt/idstools/tools/sbin_jinja/so-rule-update index 6a5976a1c..3e4b382e6 100755 --- a/salt/idstools/tools/sbin_jinja/so-rule-update +++ b/salt/idstools/tools/sbin_jinja/so-rule-update @@ -12,7 +12,7 @@ chown -R socore:socore /nsm/rules/suricata {%- if proxy %} export http_proxy={{ proxy }} export https_proxy={{ proxy }} -export no_proxy= salt['pillar.get']('manager:no_proxy') +export no_proxy=salt['pillar.get']('manager:no_proxy') {%- endif %} {%- if IDSTOOLSMERGED.config.ruleset == 'ETOPEN' %} docker exec so-idstools idstools-rulecat -v --suricata-version 6.0 -o /nsm/rules/suricata/ --merged=/nsm/rules/suricata/emerging-all.rules --force