From 64e480714af43467e400dc8031d7b47884f72ac1 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Fri, 1 Apr 2022 09:10:38 -0400
Subject: [PATCH] Fix the analyst pillar

---
 setup/so-functions | 4 ++--
 setup/so-setup     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index d00eb7962..f0adf595a 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -145,7 +145,7 @@ analyst_workstation_pillar() {
 	# Create the analyst workstation pillar
 	printf '%s\n'\
 	    "host:"\
-        "  mainint: '$INTERFACE'"\
+        "  mainint: '$MNIC'"\
         "patch:"\
         "  os:"\
 		"    source: $source"\
@@ -156,7 +156,7 @@ analyst_workstation_pillar() {
 		"  gui:"\
         "    enabled: true" >> "$pillar_file"\
 		"sensoroni:"\
-		"  node_description: '${NODE_DESCRIPTION//\'/''}'"
+		"  node_description: '${NODE_DESCRIPTION//\'/''}'" > $pillar_file
 }
 
 calculate_useable_cores() {
diff --git a/setup/so-setup b/setup/so-setup
index 0e3749bce..8365eff79 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -687,7 +687,7 @@ echo "1" > /root/accept_changes
 
 	[[ ${#ntp_servers[@]} -gt 0 ]] && configure_ntp >> $setup_log 2>&1
 
-	reserve_ports
+	if [[ ! $is_analyst ]]; then reserve_ports fi
 	
 	set_path