setup improvements

This commit is contained in:
doug
2022-12-13 11:20:00 -05:00
parent f94eb243e4
commit d3a8bdff52
6 changed files with 25 additions and 25 deletions

View File

@@ -1541,7 +1541,7 @@ networking_needful() {
source "$net_init_file"
fi
if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then
whiptail_network_init_notice
#whiptail_network_init_notice
network_init
fi
set_main_ip

View File

@@ -272,7 +272,7 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_dhcp_warn
whiptail_management_nic
fi
whiptail_network_init_notice
#whiptail_network_init_notice
# Initializing the network based on the previous information
network_init
printf '%s\n' \
@@ -287,7 +287,7 @@ if ! [[ -f $install_opt_file ]]; then
if [[ $option == "CONFIGURENETWORK" ]]; then
collect_hostname
network_init_whiptail
whiptail_network_init_notice
#whiptail_network_init_notice
network_init
printf '%s\n' \
"MNIC=$MNIC" \

View File

@@ -244,7 +244,7 @@ whiptail_storage_requirements() {
You need ${needed_val} to meet minimum requirements.
Visit https://docs.securityonion.net/en/latest/hardware.html for more information.
Visit https://docs.securityonion.net/en/2.4/hardware.html for more information.
Select YES to continue anyway, or select NO to cancel.
EOM
@@ -460,7 +460,7 @@ whiptail_install_type() {
# What kind of install are we doing?
install_type=$(whiptail --title "$whiptail_title" --radiolist \
"Choose install type. \nSee https://docs.securityonion.net/architecture for details." 13 65 5 \
"Choose install type. \nSee https://docs.securityonion.net/en/2.4/architecture.html for details." 13 65 5 \
"EVAL" "Evaluation mode (not for production) " ON \
"STANDALONE" "Standalone production install " OFF \
"DISTRIBUTED" "Distributed install submenu " OFF \
@@ -508,7 +508,7 @@ whiptail_install_type_dist_new() {
read -r -d '' mngr_msg <<- EOM
Choose a distributed manager type to start a new grid.
See https://docs.securityonion.net/architecture for details.
See https://docs.securityonion.net/en/2.4/architecture.html for details.
Note: MANAGER is the recommended option for most users. MANAGERSEARCH should only be used in very specific situations.
EOM
@@ -528,7 +528,7 @@ whiptail_install_type_dist_existing() {
local node_msg
read -r -d '' node_msg <<- EOM
Choose a distributed node type to join to an existing grid. See https://docs.securityonion.net/architecture for details.
Choose a distributed node type to join to an existing grid. See https://docs.securityonion.net/en/2.4/architecture.html for details.
Note: Heavy nodes (HEAVYNODE) are NOT recommended for most users.
EOM
@@ -776,13 +776,13 @@ whiptail_management_nic() {
filter_unused_nics
MNIC=$(whiptail --title "$whiptail_title" --radiolist "Please select your management NIC:" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )
MNIC=$(whiptail --title "$whiptail_title" --radiolist "Please select the NIC you would like to use for management. Use the arrow keys to move around and the space bar to select." 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )
local exitstatus=$?
whiptail_check_exitstatus $exitstatus
while [ -z "$MNIC" ]
do
MNIC=$(whiptail --title "$whiptail_title" --radiolist "Please select your management NIC:" 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )
MNIC=$(whiptail --title "$whiptail_title" --radiolist "Please select the NIC you would like to use for management. Use the arrow keys to move around and the space bar to select." 20 75 12 "${nic_list[@]}" 3>&1 1>&2 2>&3 )
local exitstatus=$?
whiptail_check_exitstatus $exitstatus
done
@@ -929,7 +929,7 @@ whiptail_manager_updates_warning() {
[ -n "$TESTING" ] && return
whiptail --title "$whiptail_title"\
--msgbox "Updating through the manager node requires the manager to have internet access, press ENTER to continue."\
--msgbox "Updating through the manager node requires the manager to have access to the Internet. Press ENTER to continue."\
8 75
local exitstatus=$?
@@ -986,7 +986,7 @@ whiptail_network_notice() {
[ -n "$TESTING" ] && return
whiptail --title "$whiptail_title" --yesno "Since this is a network install we assume the management interface, DNS, Hostname, etc are already set up. Select YES to continue." 8 75
whiptail --title "$whiptail_title" --yesno "Since this is a network install we assume the management interface, DNS, Hostname, etc are already set up. Select Yes if you've already configured these settings. Otherwise, select No to quit." 8 75
local exitstatus=$?
whiptail_check_exitstatus $exitstatus
@@ -1198,7 +1198,7 @@ whiptail_set_redirect() {
options+=("OTHER" "Use a different name like a FQDN or Load Balancer" OFF)
REDIRECTINFO=$(whiptail --title "$whiptail_title" --radiolist \
"How would you like to access the web interface?\n\nSecurity Onion uses strict cookie enforcement, so whatever you choose here will be the only way that you can access the web interface.\n\nIf you choose something other than IP address, then you'll need to ensure that you can resolve the name via DNS or hosts entry. If you are unsure, please select IP." 20 75 4 \
"How would you like to access the web interface?\n\nWhatever you choose here will be the only way that you can access the web interface.\n\nIf you choose something other than IP address, then you'll need to ensure that you can resolve the name via DNS or hosts entry. If you are unsure, please select IP." 20 75 4 \
"${options[@]}" \
3>&1 1>&2 2>&3
)
@@ -1298,7 +1298,7 @@ whiptail_storage_requirements() {
You need ${needed_val} to meet minimum requirements.
Visit https://docs.securityonion.net/en/latest/hardware.html for more information.
Visit https://docs.securityonion.net/en/2.4/hardware.html for more information.
Press YES to continue anyway, or press NO to cancel.
EOM
@@ -1350,10 +1350,10 @@ whiptail_you_sure() {
read -r -d '' you_sure_text <<- EOM
Welcome to Security Onion Setup!
You can use Setup for several different use cases, from a small standalone installation to a large distributed deployment for your enterprise. Don't forget to review the documentation at:
https://docs.securityonion.net
You can use Setup for several different use cases, from a small standalone installation to a large distributed deployment for your enterprise. You can learn more in the documentation at:
https://docs.securityonion.net/en/2.4/
Setup uses keyboard navigation and you can use arrow keys to move around. Certain screens may provide a list and ask you to select one or more items from that list. You can use [SPACE] to select items and [ENTER] to proceed to the next screen.
Setup uses keyboard navigation and you can use arrow keys to move around. Certain screens may provide a list and ask you to select one or more items from that list. You can use [SPACE] to select items and [ENTER] to proceed to the next screen.
Would you like to continue?
EOM