From c57d390bacd2e8756783993fbb956b04fa8e56bd Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Wed, 25 Jan 2023 17:40:40 -0500
Subject: [PATCH] Proxy Stuff

---
 setup/so-functions |  8 +-------
 setup/so-setup     |  4 ++++
 setup/so-whiptail  | 31 ++++++-------------------------
 3 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 26c66736f..c28a1c6c7 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -383,14 +383,8 @@ collect_mngr_hostname() {
 	fi
 }
 
-collect_net_method() {
+collect_net_method() { 
 	whiptail_net_method
-
-	if [[ "$network_traffic" == *"_MANAGER" ]]; then
-		whiptail_manager_updates_warning
-		MANAGERUPDATES=1
-	fi
-
 	if [[ "$network_traffic" == "PROXY"* ]]; then
 		collect_proxy no_ask
 	fi
diff --git a/setup/so-setup b/setup/so-setup
index bbc3ae971..320f774b2 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -319,6 +319,7 @@ if ! [[ -f $install_opt_file ]]; then
 		check_elastic_license
 		check_requirements "manager"
 		networking_needful
+		collect_net_method
 		collect_dockernet
 		if [[ $is_iso ]]; then
 			whiptail_airgap
@@ -342,6 +343,7 @@ if ! [[ -f $install_opt_file ]]; then
 		check_elastic_license
 		check_requirements "manager"
 		networking_needful
+		collect_net_method
 		collect_dockernet
 		if [[ $is_iso ]]; then
 			whiptail_airgap
@@ -364,6 +366,7 @@ if ! [[ -f $install_opt_file ]]; then
 		ubuntu_check
 		check_requirements "manager"
 		networking_needful
+		collect_net_method
 		collect_dockernet
 		if [[ $is_iso ]]; then
 			whiptail_airgap
@@ -384,6 +387,7 @@ if ! [[ -f $install_opt_file ]]; then
 		ubuntu_check
 		check_requirements "manager"
 		networking_needful
+		collect_net_method
 		collect_dockernet
 		if [[ $is_iso ]]; then
 			whiptail_airgap
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 5615edf41..e5de2cf5b 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -816,34 +816,15 @@ whiptail_net_method() {
 	)
 	local proxy_desc="proxy the traffic for git, docker client, wget, curl, ${pkg_mngr}, and various other SO components through a separate server in your environment."
 
-	if [[ $is_minion ]]; then
-		read -r -d '' options_msg <<- EOM
+	read -r -d '' options_msg <<- EOM
 		${options_msg}
-
-		"Direct + Manager" - all traffic passes to the Internet normally, but ${pkg_mngr} updates will instead be pulled from ${mngr_article} manager. 
-
 		"Proxy" - ${proxy_desc}
+	EOM
+	options+=(
+		" Proxy " ""
+	)
 
-		"Proxy + Manager" - proxy all traffic from the "Proxy" option except ${pkg_mngr} updates, which will instead pull from the manager.
-		EOM
-		
-		options+=(
-			" Direct + Manager " ""
-			" Proxy " ""
-			" Proxy + Manager " ""
-		)
-		local height=25
-	else
-		read -r -d '' options_msg <<- EOM
-			${options_msg}
-
-			"Proxy" - ${proxy_desc}
-		EOM
-		options+=(
-			" Proxy " ""
-		)
-		local height=17
-	fi
+	local height=17
 
 	local msg
 	read -r -d '' msg <<- EOM