[feat] Merge access method dialogs together

This commit is contained in:
William Wernert
2020-07-17 11:09:08 -04:00
parent d97271cca3
commit ede250d9e4
2 changed files with 1 additions and 10 deletions
-1
View File
@@ -867,7 +867,6 @@ generate_passwords(){
} }
get_redirect() { get_redirect() {
whiptail_set_redirect_info
whiptail_set_redirect whiptail_set_redirect
if [ "$REDIRECTINFO" = "OTHER" ]; then if [ "$REDIRECTINFO" = "OTHER" ]; then
whiptail_set_redirect_host whiptail_set_redirect_host
+1 -9
View File
@@ -997,7 +997,7 @@ whiptail_set_redirect() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
REDIRECTINFO=$(whiptail --title "Security Onion Setup" --radiolist \ REDIRECTINFO=$(whiptail --title "Security Onion Setup" --radiolist \
"Choose the access method for the web interface:" 20 75 4 \ "Choose the access method for the web interface: \nNOTE: For security reasons, we use strict cookie enforcement" 20 75 4 \
"IP" "Use IP to access the web interface" ON \ "IP" "Use IP to access the web interface" ON \
"HOSTNAME" "Use hostname to access the web interface" OFF \ "HOSTNAME" "Use hostname to access the web interface" OFF \
"OTHER" "Use a different name like a FQDN or Load Balancer" OFF 3>&1 1>&2 2>&3 ) "OTHER" "Use a different name like a FQDN or Load Balancer" OFF 3>&1 1>&2 2>&3 )
@@ -1015,14 +1015,6 @@ whiptail_set_redirect_host() {
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus
} }
whiptail_set_redirect_info() {
[ -n "$TESTING" ] && return
whiptail --title "Security Onion Setup" --msgbox "The following selection refers to accessing the web interface. \n
For security reasons, we use strict cookie enforcement." 10 75
}
whiptail_setup_complete() { whiptail_setup_complete() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return