summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRavi Pendurty <ravi.pendurty@highstreet-technologies.com>2020-10-20 08:41:41 +0200
committerRavi Pendurty <ravi.pendurty@highstreet-technologies.com>2020-10-20 08:42:15 +0200
commite4592401768a9e8c04fbcdf817d21bf39f209405 (patch)
tree657170551778b037a0f2e2118300799d3e55441b
parent92767ce7668ad4566e1f202e28b466d5fbdc2f89 (diff)
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
-rw-r--r--installation/sdnc-web/src/main/scripts/run.sh26
1 files 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 ""