Merge pull request #9648 from Security-Onion-Solutions/mkr24

Enable Proxy Support

setup/so-functions

@@ -383,16 +383,11 @@ 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
+		needs_proxy=true
 	fi
 }
 

setup/so-setup

@@ -142,6 +142,7 @@ if [[ -f /root/accept_changes ]]; then
 	mv "$setup_log" "$setup_log.bak"
 	[ -f "$error_log" ] && mv "$error_log" "$error_log.bak"
 	reinstall_init
+	reset_proxy
 fi
 
 title "Parsing Username for Install"
@@ -319,6 +320,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 +344,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 +367,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 +388,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
@@ -485,6 +490,9 @@ if ! [[ -f $install_opt_file ]]; then
 		percentage=0
 		es_heapsize
 		ls_heapsize
+		if [[ $needs_proxy ]]; then
+			set_proxy
+		fi
 		set_redirect
 		# Generate Interface Vars
 		generate_interface_vars

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