Merge pull request #10463 from Security-Onion-Solutions/TOoSmOotH-patch-2

Update so-setup
This commit is contained in:
Mike Reeves
2023-05-30 13:52:30 -04:00
committed by GitHub

View File

@@ -340,6 +340,7 @@ process_installtype
if ! [[ -f $install_opt_file ]]; then
# If you are a manager ask ALL the manager things here. I know there is code re-use but this makes it easier to add new roles
if [[ $is_eval ]]; then
info "Setting up as node type eval"
# waitforstate means we will run the full salt state at the end. This is for only nodes running the salt-master service
waitforstate=true
# Does this role have monitoring interfaces?
@@ -397,6 +398,7 @@ if ! [[ -f $install_opt_file ]]; then
collect_so_allow
whiptail_end_settings
elif [[ $is_manager ]]; then
info "Setting up as node type manager"
check_elastic_license
waitforstate=true
#ubuntu_check
@@ -417,6 +419,7 @@ if ! [[ -f $install_opt_file ]]; then
collect_so_allow
whiptail_end_settings
elif [[ $is_managersearch ]]; then
info "Setting up as node type managersearch"
check_elastic_license
waitforstate=true
[[ $is_iso ]] && whiptail_airgap
@@ -436,6 +439,7 @@ if ! [[ -f $install_opt_file ]]; then
collect_so_allow
whiptail_end_settings
elif [[ $is_sensor ]]; then
info "Setting up as node type sensor"
installer_prereq_packages
monints=true
check_requirements "sensor"
@@ -452,6 +456,7 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_end_settings
elif [[ $is_fleet ]]; then
info "Setting up as node type fleet"
check_requirements "fleet"
networking_needful
check_network_manager_conf
@@ -464,6 +469,7 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_end_settings
elif [[ $is_searchnode ]]; then
info "Setting up as node type searchnode"
installer_prereq_packages
check_requirements "elasticsearch"
networking_needful
@@ -477,6 +483,7 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_end_settings
elif [[ $is_heavynode ]]; then
info "Setting up as node type heavynode"
installer_prereq_packages
monints=true
check_requirements "heavynode"
@@ -489,6 +496,7 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_end_settings
elif [[ $is_idh ]]; then
info "Setting up as node type idh"
installer_prereq_packages
check_requirements "idh"
networking_needful
@@ -500,8 +508,8 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_end_settings
elif [[ $is_import ]]; then
info "Setting up as node type import"
waitforstate=true
monints=false
[[ $is_iso ]] && whiptail_airgap
check_elastic_license
check_requirements "import"
@@ -521,6 +529,7 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_end_settings
elif [[ $is_receiver ]]; then
info "Setting up as node type receiver"
installer_prereq_packages
check_requirements "receiver"
networking_needful
@@ -541,9 +550,9 @@ if ! [[ -f $install_opt_file ]]; then
set_proxy
fi
set_redirect
# Generate Interface Vars
generate_interface_vars
if [[ $monints ]]; then
# Generate Interface Vars
generate_interface_vars
configure_network_sensor
fi
info "Reserving ports"