From 0d52a21e3926dbbbf3d999bf3e6f4e92ff2eafc6 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Tue, 20 Oct 2020 08:41:41 +0200 Subject: Incorrect message for SSL Certificate check wrong output for SSL_CERTIFICATE/SSL_CERTIFICATE_KEY check Issue-ID: SDNC-1386 Change-Id: Ib076e4db7d6083d36c826f321b25c1ec8cb9b284 Signed-off-by: Ravi Pendurty Former-commit-id: 0ae81d67114e9549bcf2f5d3683a43b06178f77e --- installation/sdnc-web/src/main/scripts/run.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/installation/sdnc-web/src/main/scripts/run.sh b/installation/sdnc-web/src/main/scripts/run.sh index 9d912a65..f26934e5 100644 --- a/installation/sdnc-web/src/main/scripts/run.sh +++ b/installation/sdnc-web/src/main/scripts/run.sh @@ -33,18 +33,20 @@ echo " SDNRPORT : $SDNRPORT" echo " TRPCEURL : $TRPCEURL" echo " TOPOURL : $TOPOURL" echo " TILEURL : $TILEURL" -echo " SSL_CERT_DIR : $SSL_CERT_DIR" -echo -n " SSL_CERTIFICATE: $SSL_CERTIFICATE" -if [ -f "$SSL_CERTIFICATE" ]; then -echo " (exists)" -else -echo " (missing)" -fi -echo -n " SSL_CERTIFICATE_KEY: $SSL_CERTIFICATE_KEY" -if [ -f "$SSL_CERTIFICATE_KEY" ]; then -echo " (exists)" -else -echo " (missing)" +if [ "$WEBPROTOCOL" == "HTTPS" ]; then + echo " SSL_CERT_DIR : $SSL_CERT_DIR" + echo -n " SSL_CERTIFICATE: $SSL_CERTIFICATE" + if [ -f "$SSL_CERT_DIR/$SSL_CERTIFICATE" ]; then + echo " (exists)" + else + echo " (missing)" + fi + echo -n " SSL_CERTIFICATE_KEY: $SSL_CERTIFICATE_KEY" + if [ -f "$SSL_CERT_DIR/$SSL_CERTIFICATE_KEY" ]; then + echo " (exists)" + else + echo " (missing)" + fi fi echo "" -- cgit 1.2.3-korg