summary changes

This commit is contained in:
Josh Brower
2023-03-18 13:09:46 -04:00
parent 460f84d80f
commit 792732a8cf

View File

@@ -1271,19 +1271,35 @@ whiptail_setup_complete() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
if [[ -n "$REDIRECTIT" && $is_manager = true ]]; then
if [[ $waitforstate ]]; then
# Manager-type Nodes - Install Summary
if [[ -n $ALLOW_CIDR ]]; then if [[ -n $ALLOW_CIDR ]]; then
local sentence_prefix="Access" local sentence_prefix="Access"
else else
local sentence_prefix="Run so-allow to access" local sentence_prefix="Run so-allow to access"
fi fi
local accessMessage="\n${sentence_prefix} the web interface at: https://${REDIRECTIT}\n"
elif [[ $is_idh ]]; then read -r -d '' message <<- EOM
${install_type} setup is now complete!
${sentence_prefix} the Security Onion Console web interface by navigating to:
https://${REDIRECTIT}
Login with the following username and the password:
SOC Username: ${WEBUSER}
SOC Password: Use the password that was entered during setup
Press TAB and then the ENTER key to exit this screen.
EOM
whiptail --title "$whiptail_title" --msgbox "$message" 24 75 --scrolltext
else
if [[ $is_idh ]]; then
local accessMessage="\nSSH for this node has been moved to TCP/2222, accessible only from the Manager node.\n" local accessMessage="\nSSH for this node has been moved to TCP/2222, accessible only from the Manager node.\n"
else else
local accessMessage="" local accessMessage=""
fi fi
MINIONFINGERPRINT=$(salt-call --local key.finger --out=newline_values_only) MINIONFINGERPRINT=$(salt-call --local key.finger --out=newline_values_only)
read -r -d '' message <<- EOM read -r -d '' message <<- EOM
${install_type} initialization is now complete! ${install_type} initialization is now complete!
@@ -1297,12 +1313,12 @@ whiptail_setup_complete() {
Node Hostname: $HOSTNAME Node Hostname: $HOSTNAME
Node Fingerprint: Node Fingerprint:
$MINIONFINGERPRINT $MINIONFINGERPRINT
$accessMessage $accessMessage
Press TAB and then the ENTER key to exit this screen. Press TAB and then the ENTER key to exit this screen.
EOM EOM
whiptail --title "$whiptail_title" --msgbox "$message" 24 75 --scrolltext whiptail --title "$whiptail_title" --msgbox "$message" 24 75 --scrolltext
fi
} }
whiptail_setup_failed() { whiptail_setup_failed() {