improvents for checking system requirements

This commit is contained in:
m0duspwnens
2023-09-14 17:42:25 -04:00
parent af68af7f18
commit c65c9777bd
4 changed files with 59 additions and 46 deletions

View File

@@ -422,7 +422,7 @@ if ! [[ -f $install_opt_file ]]; then
# If it is an install from ISO is this airgap?
[[ $is_iso ]] && whiptail_airgap
# Make sure minimum requirements are met
check_requirements "manager"
check_requirements
# Do networking things
networking_needful
# Do we need a proxy?
@@ -453,7 +453,7 @@ if ! [[ -f $install_opt_file ]]; then
monints=true
check_elastic_license
[[ $is_iso ]] && whiptail_airgap
check_requirements "manager"
check_requirements
networking_needful
[[ ! $is_airgap ]] && collect_net_method
collect_dockernet
@@ -474,7 +474,7 @@ if ! [[ -f $install_opt_file ]]; then
check_elastic_license
waitforstate=true
[[ $is_iso ]] && whiptail_airgap
check_requirements "manager"
check_requirements
networking_needful
[[ ! $is_airgap ]] && collect_net_method
collect_dockernet
@@ -494,7 +494,7 @@ if ! [[ -f $install_opt_file ]]; then
check_elastic_license
waitforstate=true
[[ $is_iso ]] && whiptail_airgap
check_requirements "manager"
check_requirements
networking_needful
[[ ! $is_airgap ]] && collect_net_method
collect_dockernet
@@ -512,7 +512,7 @@ if ! [[ -f $install_opt_file ]]; then
elif [[ $is_sensor ]]; then
info "Setting up as node type sensor"
monints=true
check_requirements "sensor"
check_requirements
calculate_useable_cores
networking_needful
check_network_manager_conf
@@ -527,7 +527,7 @@ if ! [[ -f $install_opt_file ]]; then
elif [[ $is_fleet ]]; then
info "Setting up as node type fleet"
check_requirements "fleet"
check_requirements
networking_needful
check_network_manager_conf
set_network_dev_status_list
@@ -540,7 +540,7 @@ if ! [[ -f $install_opt_file ]]; then
elif [[ $is_searchnode ]]; then
info "Setting up as node type searchnode"
check_requirements "elasticsearch"
check_requirements
networking_needful
check_network_manager_conf
set_network_dev_status_list
@@ -554,7 +554,7 @@ if ! [[ -f $install_opt_file ]]; then
elif [[ $is_heavynode ]]; then
info "Setting up as node type heavynode"
monints=true
check_requirements "heavynode"
check_requirements
calculate_useable_cores
networking_needful
check_network_manager_conf
@@ -569,7 +569,7 @@ if ! [[ -f $install_opt_file ]]; then
elif [[ $is_idh ]]; then
info "Setting up as node type idh"
check_requirements "idh"
check_requirements
networking_needful
collect_mngr_hostname
add_mngr_ip_to_hosts
@@ -583,7 +583,7 @@ if ! [[ -f $install_opt_file ]]; then
waitforstate=true
[[ $is_iso ]] && whiptail_airgap
check_elastic_license
check_requirements "import"
check_requirements
networking_needful
[[ ! $is_airgap ]] && detect_cloud
collect_dockernet
@@ -601,7 +601,7 @@ if ! [[ -f $install_opt_file ]]; then
elif [[ $is_receiver ]]; then
info "Setting up as node type receiver"
check_requirements "receiver"
check_requirements
networking_needful
collect_mngr_hostname
add_mngr_ip_to_hosts