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

Only collect proxy once, include manager in no_proxy value on minions

Browse Source
This commit is contained in:
William Wernert
2021-03-11 16:03:43 -05:00
parent a86b2ab653
commit 3306ffa792
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/so-functions
View File

@@ -2282,6 +2282,9 @@ set_proxy() {
# Don't proxy localhost, local ip, and management ip # Don't proxy localhost, local ip, and management ip
no_proxy_string="localhost, 127.0.0.1, ${MAINIP}, ${HOSTNAME}" no_proxy_string="localhost, 127.0.0.1, ${MAINIP}, ${HOSTNAME}"
if [[ -n $MSRV ]] && [[ -n $MSRVIP ]];then
no_proxy_string="${no_proxy_string}, ${MSRVIP}, ${MSRV}"
fi
# Set proxy environment variables used by curl, wget, docker, and others # Set proxy environment variables used by curl, wget, docker, and others
{ {

16
setup/so-setup
View File

@@ -271,9 +271,15 @@ if [[ ( $is_manager || $is_import ) && $is_iso ]]; then
fi fi
fi fi
if [[ $is_airgap != true ]]; then if [[ $is_minion ]]; then
collect_proxy collect_mngr_hostname
fi fi
if ! [[ -f $install_opt_file ]] && [[ -z $is_airgap ]]; then
collect_proxy_details
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
fi
percentage=0 percentage=0
{ {
installer_progress_loop & # Run progress bar to 100 in ~8 minutes installer_progress_loop & # Run progress bar to 100 in ~8 minutes
@@ -311,10 +317,6 @@ if ! [[ -f $install_opt_file ]]; then
source "$net_init_file" source "$net_init_file"
fi fi
if [[ $is_minion ]]; then
collect_mngr_hostname
fi
if [[ $is_minion ]] || [[ $reinit_networking ]] || [[ $is_iso ]] && ! [[ -f $net_init_file ]]; then if [[ $is_minion ]] || [[ $reinit_networking ]] || [[ $is_iso ]] && ! [[ -f $net_init_file ]]; then
whiptail_management_interface_setup whiptail_management_interface_setup
fi fi
@@ -343,6 +345,7 @@ if ! [[ -f $install_opt_file ]]; then
"HOSTNAME=$HOSTNAME" \ "HOSTNAME=$HOSTNAME" \
"MSRV=$MSRV" \ "MSRV=$MSRV" \
"MSRVIP=$MSRVIP" > "$install_opt_file" "MSRVIP=$MSRVIP" > "$install_opt_file"
[[ -n $so_proxy ]] && echo "so_proxy=$so_proxy" >> "$install_opt_file"
download_repo_tarball download_repo_tarball
exec bash /root/manager_setup/securityonion/setup/so-setup "${original_args[@]}" exec bash /root/manager_setup/securityonion/setup/so-setup "${original_args[@]}"
fi fi
@@ -564,7 +567,6 @@ echo "1" > /root/accept_changes
set_main_ip >> $setup_log 2>&1 set_main_ip >> $setup_log 2>&1
compare_main_nic_ip compare_main_nic_ip
set_redirect >> $setup_log 2>&1 set_redirect >> $setup_log 2>&1
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
# Begin install # Begin install