From: r.bogacki <r.bogacki@samsung.com>
Date: Mon, 7 Oct 2019 11:26:42 +0000 (+0200)
Subject: Enabled HTTPS for sdc-workflow-designer
X-Git-Tag: 1.6.1~15
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2589c886bfd748bd346b3b02e048b52a1f7edd81;p=sdc%2Fsdc-workflow-designer.git

Enabled HTTPS for sdc-workflow-designer

Updated broken jetty start bash script

Issue-ID: SDC-2479
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: I2d8bf55e5deadd6973f6b027cb45ad797ece9993
---

diff --git a/workflow-designer-ui/docker/startup.sh b/workflow-designer-ui/docker/startup.sh
index 431a0cda..297be0de 100644
--- a/workflow-designer-ui/docker/startup.sh
+++ b/workflow-designer-ui/docker/startup.sh
@@ -1,12 +1,10 @@
 #!/bin/sh
-
 # adding support for https
 HTTPS_ENABLED=${IS_HTTPS:-"false"}
 
-if [ "$HTTPS_ENABLED" = "true" ]
-then
+if [ "$HTTPS_ENABLED" = "true" ]; then
     echo "enable ssl"
-    if [ -z "$KEYSTORE_PATH" ]; then
+    if [ -n "$KEYSTORE_PATH" ]; then
 
         keystore_pass="!ppJ.JvWn0hGh)oVF]([Kv)^"
         truststore_pass="].][xgtze]hBhz*wy]}m#lf*"
@@ -14,10 +12,8 @@ then
         java -jar "${JETTY_HOME}/start.jar" --add-to-start=https,ssl \
             jetty.sslContext.keyStorePath=$KEYSTORE_PATH \
             jetty.sslContext.keyStorePassword=${KEYSTORE_PASS:-$keystore_pass} \
-            jetty.sslContext.keyStoreType=$KEYSTORE_TYPE \
             jetty.sslContext.trustStorePath=$TRUSTSTORE_PATH \
-            jetty.sslContext.trustStorePassword=${TRUSTSTORE_PASS:-$truststore_pass} \
-            jetty.sslContext.trustStoreType=$TRUSTSTORE_TYPE \
+            jetty.sslContext.trustStorePassword=${TRUSTSTORE_PASS:-$truststore_pass} 
      else
          echo "Using jetty default SSL"
          java -jar "${JETTY_HOME}/start.jar" --add-to-start=https,ssl
@@ -27,3 +23,4 @@ else
 fi
 
 java -DproxyTo=$BACKEND $JAVA_OPTIONS -jar $JETTY_HOME/start.jar
+