From ede250d9e4febd070161cd2494ef29169925765d Mon Sep 17 00:00:00 2001 From: William Wernert Date: Fri, 17 Jul 2020 11:09:08 -0400 Subject: [PATCH] [feat] Merge access method dialogs together --- setup/so-functions | 1 - setup/so-whiptail | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 0bbc013b2..660b64393 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -867,7 +867,6 @@ generate_passwords(){ } get_redirect() { - whiptail_set_redirect_info whiptail_set_redirect if [ "$REDIRECTINFO" = "OTHER" ]; then whiptail_set_redirect_host diff --git a/setup/so-whiptail b/setup/so-whiptail index 358a18909..486428ca5 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -997,7 +997,7 @@ whiptail_set_redirect() { [ -n "$TESTING" ] && return 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 \ "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 ) @@ -1015,14 +1015,6 @@ whiptail_set_redirect_host() { 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() { [ -n "$TESTING" ] && return