From 178ac79da8b65b56fa110da0d2658de899b13bad Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Tue, 14 Jul 2020 09:05:09 -0400
Subject: [PATCH] [refactor] Set $REDIRECTIT outside of subshell

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

diff --git a/setup/so-functions b/setup/so-functions
index df7a3f254..26f7af0fc 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -871,6 +871,17 @@ get_redirect() {
 	if [ "$REDIRECTINFO" = "OTHER" ]; then
 		whiptail_set_redirect_host
 	fi
+	case $REDIRECTINFO in
+		'IP')
+			export REDIRECTIT="$MAINIP"
+			;;
+		'HOSTNAME')
+			export REDIRECTIT="$HOSTNAME"
+			;;
+		*)
+			export REDIRECTIT="$REDIRECTHOST"
+			;;
+	esac
 }
 
 got_root() {
@@ -938,18 +949,6 @@ manager_pillar() {
 			"  mtu: $MTU" >> "$pillar_file"
 	fi
 
-	case $REDIRECTINFO in
-		'IP')
-			export REDIRECTIT="$MAINIP"
-			;;
-		'HOSTNAME')
-			export REDIRECTIT=$HOSTNAME
-			;;
-		*)
-			export REDIRECTIT="$REDIRECTHOST"
-			;;
-	esac
-
 	printf '%s\n'\
 		"  elastalert: 1"\
 		"  nids_rules: $RULESETUP"\
diff --git a/setup/so-setup b/setup/so-setup
index c10ff4737..6ca4d3d57 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -378,8 +378,6 @@ if [[ $is_minion ]]; then
 	copy_ssh_key >> $setup_log 2>&1
 fi
 
-
-
 # Begin install
 {
 	# Set initial percentage to 0
@@ -633,6 +631,7 @@ else
 fi
 
 if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then 
+	echo "Running so-allow -${ALLOW_ROLE} for ${ALLOW_CIDR}"
 	IP=$ALLOW_CIDR so-allow -$ALLOW_ROLE >> $setup_log 2>&1
 fi