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

Merge pull request #5455 from Security-Onion-Solutions/kilo

Browse Source 
Consolidate whiptail screens
This commit is contained in:
Jason Ertel
2021-09-09 14:57:28 -04:00
committed by GitHub
parent eaa5e41651 94688a9adb
commit 4e2d5018a2
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
setup/so-setup
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

12
setup/so-whiptail
View File

@@ -110,13 +110,6 @@ whiptail_check_exitstatus() {
esac esac
} }
whiptail_components_adv_warning() {
[ -n "$TESTING" ] && return
whiptail --title "$whiptail_title" --msgbox "Please keep in mind the more services that 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 \