CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 01:32:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change when proxy + variables are set so strings are built correctly

Browse Source
This commit is contained in:
William Wernert
2021-03-15 14:45:23 -04:00
parent 55aee69a74
commit efc0463201
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
setup/so-setup
View File

@@ -205,21 +205,22 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_first_menu_iso whiptail_first_menu_iso
if [[ $option == "CONFIGURENETWORK" ]]; then if [[ $option == "CONFIGURENETWORK" ]]; then
collect_hostname collect_hostname
reset_prpxy >> $setup_log 2>&1
collect_proxy
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
network_init_whiptail network_init_whiptail
whiptail_management_interface_setup whiptail_management_interface_setup
network_init network_init
printf '%s\n' \ printf '%s\n' \
"MNIC=$MNIC" \ "MNIC=$MNIC" \
"HOSTNAME=$HOSTNAME" > "$net_init_file" "HOSTNAME=$HOSTNAME" > "$net_init_file"
set_main_ip >> $setup_log 2>&1
compare_main_nic_ip
reset_prpxy >> $setup_log 2>&1
collect_proxy
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
whiptail_net_setup_complete whiptail_net_setup_complete
else else
true true
fi fi
fi fi
collect_hostname
whiptail_install_type whiptail_install_type
else else
source $install_opt_file source $install_opt_file
@@ -273,19 +274,6 @@ if [[ ( $is_manager || $is_import ) && $is_iso ]]; then
fi fi
fi fi
if [[ $is_minion ]]; then
collect_mngr_hostname
fi
if ! [[ -f $install_opt_file ]]; then
reset_prpxy >> $setup_log 2>&1 # Always reset proxy when answer file doesn't exist
if [[ -z $is_airgap ]]; then
collect_proxy_details
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
fi
fi
percentage=0 percentage=0
{ {
installer_progress_loop & # Run progress bar to 98 in ~8 minutes while waiting for package installs installer_progress_loop & # Run progress bar to 98 in ~8 minutes while waiting for package installs
@@ -319,6 +307,7 @@ if ! [[ -f $install_opt_file ]]; then
[[ -f $net_init_file ]] && whiptail_net_reinit && reinit_networking=true [[ -f $net_init_file ]] && whiptail_net_reinit && reinit_networking=true
if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then
collect_hostname
network_init_whiptail network_init_whiptail
else else
source "$net_init_file" source "$net_init_file"
@@ -331,6 +320,19 @@ if ! [[ -f $install_opt_file ]]; then
if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then
network_init network_init
fi fi
set_main_ip >> $setup_log 2>&1
compare_main_nic_ip
if [[ $is_minion ]]; then
collect_mngr_hostname
fi
reset_prpxy >> $setup_log 2>&1
if [[ -z $is_airgap ]]; then
collect_proxy_details
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
fi
if [[ -n "$TURBO" ]]; then if [[ -n "$TURBO" ]]; then
use_turbo_proxy use_turbo_proxy
@@ -571,8 +573,6 @@ whiptail_make_changes
echo "1" > /root/accept_changes echo "1" > /root/accept_changes
# This block sets REDIRECTIT which is used by a function outside the below subshell # This block sets REDIRECTIT which is used by a function outside the below subshell
set_main_ip >> $setup_log 2>&1
compare_main_nic_ip
set_redirect >> $setup_log 2>&1 set_redirect >> $setup_log 2>&1