From 7c5343ebe1e386e2ec04f41528d13a334e087e50 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 10 Jun 2020 15:35:15 -0400
Subject: [PATCH] copy local firewall yaml files during setup -
 https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/641

---
 setup/so-functions | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 6dd0f5793..bb226a5fb 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -745,22 +745,11 @@ fireeye_pillar() {
 # Generate Firewall Templates
 firewall_generate_templates() {
 
-	local firewall_pillar_path=$local_salt_dir/pillar/firewall
+	local firewall_pillar_path=$local_salt_dir/salt/firewall
 	mkdir -p "$firewall_pillar_path"
+   
+    cp ../files/firewall/* /opt/so/saltstack/local/salt/firewall/ >> "$setup_log" 2>&1
 
-	for i in analyst beats_endpoint forward_nodes master minions osquery_endpoint search_nodes wazuh_endpoint
-	do
-	  printf '%s\n'\
-	  "firewall:"\
-	  "  alias:"\
-	  "    $i:"\
-	  "      ips:" \
-	  "        delete:"\
-	  "        allow:"\
-	  "          - 127.0.0.1"\
-	  "" > "$firewall_pillar_path"/$i.sls
-	  echo "Added $i Template"
-	done
 }
 
 fleet_pillar() {