From e717579113a592a5e07572c141cbecf1e2b14071 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Sat, 17 Sep 2022 09:51:26 -0400
Subject: [PATCH] Firewall Fun

---
 salt/firewall/{hostgroups2 => hostgroups}/analyst      |  0
 .../{hostgroups2 => hostgroups}/analyst_workstations   |  0
 salt/firewall/{hostgroups2 => hostgroups}/eval         |  0
 salt/firewall/{hostgroups2 => hostgroups}/heavynodes   |  0
 salt/firewall/{hostgroups2 => hostgroups}/idh          |  0
 salt/firewall/{hostgroups2 => hostgroups}/manager      |  0
 salt/firewall/{hostgroups2 => hostgroups}/receivers    |  0
 salt/firewall/{hostgroups2 => hostgroups}/searchnodes  |  0
 salt/firewall/{hostgroups2 => hostgroups}/standalone   |  0
 salt/firewall/{portgroups2 => portgroups}/analyst      |  0
 .../{portgroups2 => portgroups}/analyst_workstations   |  0
 salt/firewall/{portgroups2 => portgroups}/eval         |  0
 salt/firewall/{portgroups2 => portgroups}/heavynodes   |  0
 salt/firewall/{portgroups2 => portgroups}/idh          |  0
 salt/firewall/{portgroups2 => portgroups}/manager      |  0
 salt/firewall/{portgroups2 => portgroups}/receivers    |  0
 salt/firewall/{portgroups2 => portgroups}/searchnodes  |  0
 salt/firewall/{portgroups2 => portgroups}/standalone   |  0
 salt/firewall/soc_firewall.yaml                        | 10 ++++++++++
 19 files changed, 10 insertions(+)
 rename salt/firewall/{hostgroups2 => hostgroups}/analyst (100%)
 rename salt/firewall/{hostgroups2 => hostgroups}/analyst_workstations (100%)
 rename salt/firewall/{hostgroups2 => hostgroups}/eval (100%)
 rename salt/firewall/{hostgroups2 => hostgroups}/heavynodes (100%)
 rename salt/firewall/{hostgroups2 => hostgroups}/idh (100%)
 rename salt/firewall/{hostgroups2 => hostgroups}/manager (100%)
 rename salt/firewall/{hostgroups2 => hostgroups}/receivers (100%)
 rename salt/firewall/{hostgroups2 => hostgroups}/searchnodes (100%)
 rename salt/firewall/{hostgroups2 => hostgroups}/standalone (100%)
 rename salt/firewall/{portgroups2 => portgroups}/analyst (100%)
 rename salt/firewall/{portgroups2 => portgroups}/analyst_workstations (100%)
 rename salt/firewall/{portgroups2 => portgroups}/eval (100%)
 rename salt/firewall/{portgroups2 => portgroups}/heavynodes (100%)
 rename salt/firewall/{portgroups2 => portgroups}/idh (100%)
 rename salt/firewall/{portgroups2 => portgroups}/manager (100%)
 rename salt/firewall/{portgroups2 => portgroups}/receivers (100%)
 rename salt/firewall/{portgroups2 => portgroups}/searchnodes (100%)
 rename salt/firewall/{portgroups2 => portgroups}/standalone (100%)

diff --git a/salt/firewall/hostgroups2/analyst b/salt/firewall/hostgroups/analyst
similarity index 100%
rename from salt/firewall/hostgroups2/analyst
rename to salt/firewall/hostgroups/analyst
diff --git a/salt/firewall/hostgroups2/analyst_workstations b/salt/firewall/hostgroups/analyst_workstations
similarity index 100%
rename from salt/firewall/hostgroups2/analyst_workstations
rename to salt/firewall/hostgroups/analyst_workstations
diff --git a/salt/firewall/hostgroups2/eval b/salt/firewall/hostgroups/eval
similarity index 100%
rename from salt/firewall/hostgroups2/eval
rename to salt/firewall/hostgroups/eval
diff --git a/salt/firewall/hostgroups2/heavynodes b/salt/firewall/hostgroups/heavynodes
similarity index 100%
rename from salt/firewall/hostgroups2/heavynodes
rename to salt/firewall/hostgroups/heavynodes
diff --git a/salt/firewall/hostgroups2/idh b/salt/firewall/hostgroups/idh
similarity index 100%
rename from salt/firewall/hostgroups2/idh
rename to salt/firewall/hostgroups/idh
diff --git a/salt/firewall/hostgroups2/manager b/salt/firewall/hostgroups/manager
similarity index 100%
rename from salt/firewall/hostgroups2/manager
rename to salt/firewall/hostgroups/manager
diff --git a/salt/firewall/hostgroups2/receivers b/salt/firewall/hostgroups/receivers
similarity index 100%
rename from salt/firewall/hostgroups2/receivers
rename to salt/firewall/hostgroups/receivers
diff --git a/salt/firewall/hostgroups2/searchnodes b/salt/firewall/hostgroups/searchnodes
similarity index 100%
rename from salt/firewall/hostgroups2/searchnodes
rename to salt/firewall/hostgroups/searchnodes
diff --git a/salt/firewall/hostgroups2/standalone b/salt/firewall/hostgroups/standalone
similarity index 100%
rename from salt/firewall/hostgroups2/standalone
rename to salt/firewall/hostgroups/standalone
diff --git a/salt/firewall/portgroups2/analyst b/salt/firewall/portgroups/analyst
similarity index 100%
rename from salt/firewall/portgroups2/analyst
rename to salt/firewall/portgroups/analyst
diff --git a/salt/firewall/portgroups2/analyst_workstations b/salt/firewall/portgroups/analyst_workstations
similarity index 100%
rename from salt/firewall/portgroups2/analyst_workstations
rename to salt/firewall/portgroups/analyst_workstations
diff --git a/salt/firewall/portgroups2/eval b/salt/firewall/portgroups/eval
similarity index 100%
rename from salt/firewall/portgroups2/eval
rename to salt/firewall/portgroups/eval
diff --git a/salt/firewall/portgroups2/heavynodes b/salt/firewall/portgroups/heavynodes
similarity index 100%
rename from salt/firewall/portgroups2/heavynodes
rename to salt/firewall/portgroups/heavynodes
diff --git a/salt/firewall/portgroups2/idh b/salt/firewall/portgroups/idh
similarity index 100%
rename from salt/firewall/portgroups2/idh
rename to salt/firewall/portgroups/idh
diff --git a/salt/firewall/portgroups2/manager b/salt/firewall/portgroups/manager
similarity index 100%
rename from salt/firewall/portgroups2/manager
rename to salt/firewall/portgroups/manager
diff --git a/salt/firewall/portgroups2/receivers b/salt/firewall/portgroups/receivers
similarity index 100%
rename from salt/firewall/portgroups2/receivers
rename to salt/firewall/portgroups/receivers
diff --git a/salt/firewall/portgroups2/searchnodes b/salt/firewall/portgroups/searchnodes
similarity index 100%
rename from salt/firewall/portgroups2/searchnodes
rename to salt/firewall/portgroups/searchnodes
diff --git a/salt/firewall/portgroups2/standalone b/salt/firewall/portgroups/standalone
similarity index 100%
rename from salt/firewall/portgroups2/standalone
rename to salt/firewall/portgroups/standalone
diff --git a/salt/firewall/soc_firewall.yaml b/salt/firewall/soc_firewall.yaml
index 2f18406c4..a0b454349 100644
--- a/salt/firewall/soc_firewall.yaml
+++ b/salt/firewall/soc_firewall.yaml
@@ -3,39 +3,49 @@ firewall:
     analyst_workstations:
       description: List of IP Addresses or CIDR blocks to allow analyst workstations.
       file: True
+      global: True
       title: Analyst Workstations
     analyst: 
       description: List of IP Addresses or CIDR blocks to allow analyst connections.
       file: True
+      global: True
       title: Analysts
     standalone: 
       description: List of IP Addresses or CIDR blocks to allow standalone connections.
       file: True
+      global: True
       title: Standalone
       advanced: True
     eval: 
       description: List of IP Addresses or CIDR blocks to allow eval connections.
       file: True
+      global: True
       title: Eval
       advanced: True
     idh: 
       description: List of IP Addresses or CIDR blocks to allow idh connections.
       file: True
+      global: True
       title: IDH Nodes
     manager: 
       description: List of IP Addresses or CIDR blocks to allow manager connections.
       file: True
+      global: True
       title: Manager
       advanced: True
     heavynodes: 
       description: List of IP Addresses or CIDR blocks to allow heavynode connections.
       file: True
+      global: True
       title: Heavy Nodes
     searchnodes: 
       description: List of IP Addresses or CIDR blocks to allow searchnode connections.
       file: True
+      globaal: True
       title: Searchnodes
     receivers: 
       description: List of IP Addresses or CIDR blocks to allow receiver connections.
       file: True
+      global: True
       title: Receivers
+