Eliminate adv component popup

This commit is contained in:
Jason Ertel
2021-09-09 14:29:09 -04:00
parent 63f67b3500
commit 94688a9adb
2 changed files with 3 additions and 10 deletions

View File

@@ -473,7 +473,6 @@ if [[ $is_manager && ! $is_eval ]]; then
fi fi
if [[ $is_manager ]]; then if [[ $is_manager ]]; then
whiptail_components_adv_warning
whiptail_enable_components whiptail_enable_components
if [[ "$STRELKA" = 1 ]]; then if [[ "$STRELKA" = 1 ]]; then

View File

@@ -110,13 +110,6 @@ whiptail_check_exitstatus() {
esac esac
} }
whiptail_components_adv_warning() {
[ -n "$TESTING" ] && return
whiptail --title "$whiptail_title" --msgbox "The next screen will provide the ability to choose optional services to be enabled for this installation. Be aware that the more services you enable the more RAM that is required." 8 75
}
whiptail_create_admin_user() { whiptail_create_admin_user() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
@@ -408,9 +401,10 @@ whiptail_enable_components() {
PLAYBOOK=0 PLAYBOOK=0
STRELKA=0 STRELKA=0
description="Choose optional services to be enabled for this installation. Be aware that the more services you enable the more RAM that is required."
if [[ $is_eval ]]; then if [[ $is_eval ]]; then
COMPONENTS=$(whiptail --title "$whiptail_title" --checklist \ COMPONENTS=$(whiptail --title "$whiptail_title" --checklist \
"Select Components to install:" 20 75 8 \ "$description" 20 75 8 \
GRAFANA "Enable Grafana for system monitoring" ON \ GRAFANA "Enable Grafana for system monitoring" ON \
OSQUERY "Enable Fleet with osquery" ON \ OSQUERY "Enable Fleet with osquery" ON \
WAZUH "Enable Wazuh" ON \ WAZUH "Enable Wazuh" ON \
@@ -419,7 +413,7 @@ if [[ $is_eval ]]; then
STRELKA "Enable Strelka" ON 3>&1 1>&2 2>&3) STRELKA "Enable Strelka" ON 3>&1 1>&2 2>&3)
else else
COMPONENTS=$(whiptail --title "$whiptail_title" --checklist \ COMPONENTS=$(whiptail --title "$whiptail_title" --checklist \
"Select Components to install:" 20 75 7 \ "$description" 20 75 7 \
OSQUERY "Enable Fleet with osquery" ON \ OSQUERY "Enable Fleet with osquery" ON \
WAZUH "Enable Wazuh" ON \ WAZUH "Enable Wazuh" ON \
THEHIVE "Enable TheHive" ON \ THEHIVE "Enable TheHive" ON \