diff options
| author |   andre.schmid <andre.schmid@est.tech> | 2020-05-05 11:11:54 +0100 |
|---|---|---|
| committer | André Schmid <andre.schmid@est.tech> | 2020-05-06 10:29:59 +0000 |
| commit | 27564b747db964cea07fe94d855ecedce6d6326d (patch) | |
| tree | 3bf96133848f062c7904ce00aa3090173100d5f9 /sdc-workflow-designer-be | |
| parent | 43e7a9e755d089379074331cd2034d68b02dbca8 (diff) | |
Adjust docker-compose and SSL config
SSL is disabled by default as it is documented in the README.
Expose a port for cassandra docker.
Fix sdc-workflow-backend SDC_ENDPOINT environment variable.
Add some build artifacts to gitignore.
Issue-ID: SDC-3020
Change-Id: If4d81752f6b7c2c1ec2a73327bebbb8ef3ce0420
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'sdc-workflow-designer-be')
| -rw-r--r-- | sdc-workflow-designer-be/.gitignore | 1 | ||||
| -rw-r--r-- | sdc-workflow-designer-be/docker/startup.sh | 3 | ||||
| -rw-r--r-- | sdc-workflow-designer-be/src/main/resources/application.properties | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/sdc-workflow-designer-be/.gitignore b/sdc-workflow-designer-be/.gitignore new file mode 100644 index 00000000..d2d0c630 --- /dev/null +++ b/sdc-workflow-designer-be/.gitignore @@ -0,0 +1 @@ +/docker/*.jar diff --git a/sdc-workflow-designer-be/docker/startup.sh b/sdc-workflow-designer-be/docker/startup.sh index bc1d6463..cda039ab 100644 --- a/sdc-workflow-designer-be/docker/startup.sh +++ b/sdc-workflow-designer-be/docker/startup.sh @@ -3,6 +3,7 @@ HTTPS_ENABLED=${SERVER_SSL_ENABLED:-"false"} if [ "$HTTPS_ENABLED" = "true" ] then + echo "HTTPS is enabled. Configuring keystore." KEYSTORE=${SERVER_SSL_KEYSTORE_PATH} if [ -f "$KEYSTORE" ]; then echo "$KEYSTORE exist" @@ -24,5 +25,7 @@ then cp /truststore $TRUSTSTORE_DIR chmod 755 $TRUSTSTORE fi +else + echo "HTTPS is disabled." fi java ${JAVA_OPTIONS} -jar /app.jar ${SPRING_BOOT_OPTIONS}
\ No newline at end of file diff --git a/sdc-workflow-designer-be/src/main/resources/application.properties b/sdc-workflow-designer-be/src/main/resources/application.properties index 7dcc2c4b..d64d7a9f 100644 --- a/sdc-workflow-designer-be/src/main/resources/application.properties +++ b/sdc-workflow-designer-be/src/main/resources/application.properties @@ -17,7 +17,7 @@ server.servlet.context-path=/ http.port=${HTTP_PORT:8080} server.port=${SERVER_PORT:8443} -server.ssl.enabled=${SERVER_SSL_ENABLED:true} +server.ssl.enabled=${SERVER_SSL_ENABLED:false} server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:} server.ssl.key-store-password=${SERVER_SSL_KEY_PASSWORD:} server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:} |