aboutsummaryrefslogtreecommitdiffstats
path: root/workflow-designer-ui
diff options
context:
space:
mode:
authorr.bogacki <r.bogacki@samsung.com>2019-10-07 13:26:42 +0200
committerRobert Bogacki <r.bogacki@samsung.com>2019-10-07 13:24:50 +0000
commit2589c886bfd748bd346b3b02e048b52a1f7edd81 (patch)
tree659d1d7485fa953e18e65f180b1cbd89d6f96664 /workflow-designer-ui
parente69e424aa205dce56cebda5babce30fe260b10f8 (diff)
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
Diffstat (limited to 'workflow-designer-ui')
-rw-r--r--workflow-designer-ui/docker/startup.sh11
1 files changed, 4 insertions, 7 deletions
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
+