From bed522219e92afeef55960f8e9b13b61f7243e83 Mon Sep 17 00:00:00 2001 From: ronivay Date: Sat, 30 May 2020 18:40:00 +0300 Subject: [PATCH] add accidentaly deleted HTTPS modifications --- xo-install.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xo-install.sh b/xo-install.sh index a258a60..a94893f 100755 --- a/xo-install.sh +++ b/xo-install.sh @@ -44,10 +44,13 @@ PROGRESS="[${COLOR_BLUE}..${COLOR_N}]" # Protocol to use for webserver. If both of the X.509 certificate files exist, # then assume that we want to enable HTTPS for the server. -if [[ -s $PATH_TO_HTTPS_CERT ]] && [[ -s $PATH_TO_HTTPS_KEY ]]; then - HTTPS=true -else - HTTPS=false +if [[ $PATH_TO_HTTPS_CERT ]] && [[ $PATH_TO_HTTPS_KEY ]]; then + if [[ -s $PATH_TO_HTTPS_CERT ]] && [[ -s $PATH_TO_HTTPS_KEY ]]; then + HTTPS=true + else + HTTPS=false + HTTPSFAIL="- certificate or Key doesn't exist or file is empty" + fi fi # create logpath if doesn't exist @@ -842,6 +845,7 @@ else fi echo -e "Port: ${COLOR_WHITE}$PORT${COLOR_N}" +echo -e "HTTPS: ${COLOR_WHITE}${HTTPS}${COLOR_N} ${COLOR_RED}${HTTPSFAIL}${COLOR_N}" echo -e "Git Branch for source: ${COLOR_WHITE}$BRANCH${COLOR_N}" echo -e "Following plugins will be installed: ${COLOR_WHITE}"$PLUGINS"${COLOR_N}" echo -e "Number of previous installations to preserve: ${COLOR_WHITE}$PRESERVE${COLOR_N}"