diff options
author | r.bogacki <r.bogacki@samsung.com> | 2019-10-01 08:58:51 +0200 |
---|---|---|
committer | Oren Kleks <orenkle@amdocs.com> | 2019-10-06 06:18:49 +0000 |
commit | e69e424aa205dce56cebda5babce30fe260b10f8 (patch) | |
tree | 6571456c8ddfdfdb7b7165bd4881e10e1960d526 /workflow-designer-be/src/main | |
parent | 12d0516104bae658d9a83e4eff767ac57d575556 (diff) |
Enabled HTTPS for sdc-workflow-designer
-Enabled HTTPS for frontend and backend
-Updated paths and passwords for a certificates
Issue-ID: SDC-2479
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: Ibccdae478c047aac1a69192e3c257ea31dc39cac
Diffstat (limited to 'workflow-designer-be/src/main')
-rw-r--r-- | workflow-designer-be/src/main/resources/application-dev.properties | 14 | ||||
-rw-r--r-- | workflow-designer-be/src/main/resources/application.properties | 8 | ||||
-rw-r--r-- | workflow-designer-be/src/main/resources/assembly.xml | 23 | ||||
-rw-r--r-- | workflow-designer-be/src/main/resources/org.onap.sdc.p12 | bin | 4051 -> 0 bytes |
4 files changed, 34 insertions, 11 deletions
diff --git a/workflow-designer-be/src/main/resources/application-dev.properties b/workflow-designer-be/src/main/resources/application-dev.properties index 98eda721..2fdd9076 100644 --- a/workflow-designer-be/src/main/resources/application-dev.properties +++ b/workflow-designer-be/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ #/ -# Copyright © 2016-2018 European Support Limited +# Copyright � 2016-2018 European Support Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,12 +17,12 @@ server.servlet.context-path=/ http.port=${HTTP_PORT:8080} server.port=${SERVER_PORT:8443} -server.ssl.enabled=${SERVER_SSL_ENABLED:false} -server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:} -server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:} -server.ssl.key-store-type=${SERVER_SSL_KEYSTORE_TYPE:} +server.ssl.enabled=${SERVER_SSL_ENABLED:true} +server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:!ppJ.JvWn0hGh)oVF]([Kv)^} +server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:/etc/server-https-keystore/org.onap.sdc.p12} +server.ssl.key-store-type=${SERVER_SSL_KEYSTORE_TYPE:PKCS12} -sdc.be.protocol=${SDC_PROTOCOL:} +sdc.be.protocol=${SDC_PROTOCOL:https} sdc.be.endpoint=${SDC_ENDPOINT:} sdc.be.external.user=${SDC_USER:} sdc.be.external.password=${SDC_PASSWORD:} @@ -55,4 +55,4 @@ logging.file=${java.io.tmpdir}/application.log logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} - %msg%n # Logging pattern for file -logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%
\ No newline at end of file +logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg% diff --git a/workflow-designer-be/src/main/resources/application.properties b/workflow-designer-be/src/main/resources/application.properties index e7224a75..44b048ac 100644 --- a/workflow-designer-be/src/main/resources/application.properties +++ b/workflow-designer-be/src/main/resources/application.properties @@ -18,11 +18,11 @@ http.port=${HTTP_PORT:8080} server.port=${SERVER_PORT:8443} server.ssl.enabled=${SERVER_SSL_ENABLED:true} -server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:rTIS;B4kM]2GHcNK2c3B4&Ng} -server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:classpath:org.onap.sdc.p12} -server.ssl.key-store-type=${SERVER_SSL_KEYSTORE_TYPE:PKCS12} +server.ssl.key-password=${SERVER_SSL_KEY_PASSWORD:} +server.ssl.key-store=${SERVER_SSL_KEYSTORE_PATH:} +server.ssl.key-store-type=${SERVER_SSL_KEYSTORE_TYPE:} -sdc.be.protocol=${SDC_PROTOCOL:https} +sdc.be.protocol=${SDC_PROTOCOL:} sdc.be.endpoint=${SDC_ENDPOINT:} sdc.be.external.user=${SDC_USER:} sdc.be.external.password=${SDC_PASSWORD:} diff --git a/workflow-designer-be/src/main/resources/assembly.xml b/workflow-designer-be/src/main/resources/assembly.xml new file mode 100644 index 00000000..f8b802c4 --- /dev/null +++ b/workflow-designer-be/src/main/resources/assembly.xml @@ -0,0 +1,23 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> + <id>sdc-wfd-be-files</id> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <includes> + <include>${project.build.finalName}.jar</include> + </includes> + <directory>${project.build.directory}</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <includes> + <include>org.onap.sdc.p12</include> + </includes> + <directory>${project.basedir}/../workflow-designer-ui/docker</directory> + <outputDirectory>/etc/server-https-keystore</outputDirectory> + </fileSet> + </fileSets> +</assembly> diff --git a/workflow-designer-be/src/main/resources/org.onap.sdc.p12 b/workflow-designer-be/src/main/resources/org.onap.sdc.p12 Binary files differdeleted file mode 100644 index ee000dc7..00000000 --- a/workflow-designer-be/src/main/resources/org.onap.sdc.p12 +++ /dev/null |