From 19f49dde75246ac120b275a970b85180b393d302 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 8 Feb 2023 13:14:08 -0500 Subject: [PATCH 1/2] recusivly copy the firewall files for setup --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index e15c7a191..0dc4751bd 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1181,7 +1181,7 @@ firewall_generate_templates() { local firewall_pillar_path=$local_salt_dir/salt/firewall logCmd "mkdir -p $firewall_pillar_path" - logCmd "cp ../files/firewall/* /opt/so/saltstack/local/salt/firewall/" + logCmd "cp -r ../files/firewall/* /opt/so/saltstack/local/salt/firewall/" # i think this can be commented out for 2.4 #for i in analyst beats_endpoint endgame sensors manager managersearch elastic_agent_endpoint searchnodes; do From 3d34a49e4427d9452dbe3284f491207cb43c6699 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 8 Feb 2023 13:21:48 -0500 Subject: [PATCH 2/2] change to new local ports file --- files/firewall/assigned_hostgroups.local.map.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/firewall/assigned_hostgroups.local.map.yaml b/files/firewall/assigned_hostgroups.local.map.yaml index 9a758161c..07f389af0 100644 --- a/files/firewall/assigned_hostgroups.local.map.yaml +++ b/files/firewall/assigned_hostgroups.local.map.yaml @@ -1,6 +1,6 @@ {% import_yaml 'firewall/ports/ports.yaml' as default_portgroups %} {% set default_portgroups = default_portgroups.firewall.ports %} -{% import_yaml 'firewall/portgroups.local.yaml' as local_portgroups %} +{% import_yaml 'firewall/ports/ports.local.yaml' as local_portgroups %} {% if local_portgroups.firewall.ports %} {% set local_portgroups = local_portgroups.firewall.ports %} {% else %}