Merge pull request #9851 from Security-Onion-Solutions/somefixes2

Fix install

salt/firewall/defaults_soc_firewall.yaml

@@ -1,4 +1,12 @@
 firewall:
+  custom_groups:
+    groups:
+      description: List of group names to create.
+      multiline: True
+      forcedType: "[]string"
+      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.

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
 
 }