From 99105c7563b87bf8f37473e9062448354479e1d6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 24 Feb 2023 10:43:41 -0500 Subject: [PATCH 1/4] Add fireall custom groups --- salt/firewall/custom_groups/groups | 0 salt/firewall/soc_firewall.yaml | 7 +++++++ 2 files changed, 7 insertions(+) create mode 100644 salt/firewall/custom_groups/groups diff --git a/salt/firewall/custom_groups/groups b/salt/firewall/custom_groups/groups new file mode 100644 index 000000000..e69de29bb diff --git a/salt/firewall/soc_firewall.yaml b/salt/firewall/soc_firewall.yaml index 614f98190..ff2409b54 100644 --- a/salt/firewall/soc_firewall.yaml +++ b/salt/firewall/soc_firewall.yaml @@ -1,4 +1,11 @@ firewall: + custom_groups: + groups: + description: List of group names to create. + file: True + global: True + title: Custom Firewall Groups + helpLink: firewall.html#host-groups hostgroups: analyst_workstations: description: List of IP addresses or CIDR blocks to allow analyst workstations. From a0eb505db036d303f18687e08561d603b0a3cf36 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 24 Feb 2023 11:12:17 -0500 Subject: [PATCH 2/4] Add fireall custom groups --- .../firewall/{soc_firewall.yaml => defaults_soc_firewall.yaml} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename salt/firewall/{soc_firewall.yaml => defaults_soc_firewall.yaml} (98%) diff --git a/salt/firewall/soc_firewall.yaml b/salt/firewall/defaults_soc_firewall.yaml similarity index 98% rename from salt/firewall/soc_firewall.yaml rename to salt/firewall/defaults_soc_firewall.yaml index ff2409b54..718cba441 100644 --- a/salt/firewall/soc_firewall.yaml +++ b/salt/firewall/defaults_soc_firewall.yaml @@ -2,7 +2,8 @@ firewall: custom_groups: groups: description: List of group names to create. - file: True + multiline: True + forcedType: "[]string" global: True title: Custom Firewall Groups helpLink: firewall.html#host-groups From a25acb45581a81af30f36b6b5e6cc27a9bbfe8dc Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 24 Feb 2023 12:19:57 -0500 Subject: [PATCH 3/4] comment out minion installs for now --- setup/so-functions | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 64248c30f..be5c7e314 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2031,13 +2031,13 @@ saltify() { # THIS IS A TEMP HACK logCmd "dnf -y install securityonion-salt python3-audit python3-libsemanage python3-policycoreutils python3-setools python3-setuptools python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python3-docker" logCmd "mkdir -p /etc/salt/minion.d" - if [[ $waitforstate ]]; then - # Since this is a salt master so let's install it - logCmd "" - else - # We just need the minion - logCmd "dnf -y install salt-minion" - fi + #if [[ $waitforstate ]]; then + # # Since this is a salt master so let's install it + # logCmd "" + #else + # # We just need the minion + # logCmd "dnf -y install salt-minion" + #fi fi } From afccd3f820a4ddbf8551551de56bb6f2722cd9d6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 24 Feb 2023 12:21:14 -0500 Subject: [PATCH 4/4] comment out minion installs for now --- salt/firewall/custom_groups/groups | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 salt/firewall/custom_groups/groups diff --git a/salt/firewall/custom_groups/groups b/salt/firewall/custom_groups/groups deleted file mode 100644 index e69de29bb..000000000