From ee62faae72ef70201df5968425aaa80179265584 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Fri, 14 Aug 2020 09:10:28 -0400 Subject: [PATCH] Only show the web interface link when the redirect URL is available, such as on manager nodes --- setup/so-whiptail | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/setup/so-whiptail b/setup/so-whiptail index f84090e4f..89fe784ae 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -1064,17 +1064,21 @@ whiptail_setup_complete() { [ -n "$TESTING" ] && return - if [[ -n $ALLOW_CIDR ]]; then - local sentence_prefix="Access" + if [[ -n "$REDIRECTIT" ]]; then + if [[ -n $ALLOW_CIDR ]]; then + local sentence_prefix="Access" + else + local sentence_prefix="Run so-allow after reboot to access" + fi + local accessMessage="\n${sentence_prefix} the web interface at: https://${REDIRECTIT}\n" else - local sentence_prefix="Run so-allow after reboot to access" + local accessMessage="" fi + read -r -d '' message <<- EOM Finished ${install_type} installation. - - ${sentence_prefix} the web interface at: https://${REDIRECTIT} - + $accessMessage Press ENTER to reboot. EOM