From: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Date: Tue, 20 Oct 2020 06:41:41 +0000 (+0200)
Subject: Incorrect message for SSL Certificate check
X-Git-Tag: 2.1.0~21
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=e4592401768a9e8c04fbcdf817d21bf39f209405

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 <ravi.pendurty@highstreet-technologies.com>

Former-commit-id: 1018575d646cccb804314e07b46994fee4b54b33
---

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 ""