diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-12-07 18:13:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-07 18:13:34 +0000 |
| commit | c7513ca0c231b93810db241ef1e6ca07a13d8c46 (patch) | |
| tree | 5ec7898b88c2a0de97b2e1dc48baa0a752dad0ac | |
| parent | 36284a43dd0da905a1e033ffd381892e1feaffdc (diff) | |
| parent | 3130bf87f1caea70065d572e0973097b5e164a17 (diff) | |
Merge "Updating the certs for AAF"
| -rw-r--r-- | charts/aai-sparky-be/resources/config/application-ssl.properties | 7 | ||||
| -rw-r--r-- | charts/aai-sparky-be/resources/config/application.properties | 2 | ||||
| -rw-r--r-- | charts/aai-sparky-be/resources/config/auth/aai-os-cert.p12 | bin | 4357 -> 0 bytes | |||
| -rw-r--r-- | charts/aai-sparky-be/resources/config/auth/org.onap.aai.p12 | bin | 0 -> 4307 bytes | |||
| -rw-r--r-- | charts/aai-sparky-be/resources/config/auth/tomcat_keystore | bin | 2214 -> 0 bytes | |||
| -rw-r--r-- | charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks | bin | 0 -> 117990 bytes |
6 files changed, 6 insertions, 3 deletions
diff --git a/charts/aai-sparky-be/resources/config/application-ssl.properties b/charts/aai-sparky-be/resources/config/application-ssl.properties index 04a5096..2ea1bf1 100644 --- a/charts/aai-sparky-be/resources/config/application-ssl.properties +++ b/charts/aai-sparky-be/resources/config/application-ssl.properties @@ -13,5 +13,8 @@ # limitations under the License. server.port=8000 -server.ssl.key-store=file:${CONFIG_HOME}/auth/tomcat_keystore -server.ssl.key-store-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 +server.ssl.key-store=file:${CONFIG_HOME}/auth/org.onap.aai.p12 +server.ssl.key-store-password=OBF:1x0v1g131lps1cix1rjb1n5p22691qab1hm51hfc1i2t1lmr1liz1hyx1hfq1hn51qcr22651n5t1rh31cgl1lu61g2f1x1r +server.ssl.enabled-protocols=TLSv1.1,TLSv1.2 +server.ssl.trust-store=file:${CONFIG_HOME}/auth/truststoreONAPall.jks +server.ssl.trust-store-password=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0 diff --git a/charts/aai-sparky-be/resources/config/application.properties b/charts/aai-sparky-be/resources/config/application.properties index aa93c06..da4812c 100644 --- a/charts/aai-sparky-be/resources/config/application.properties +++ b/charts/aai-sparky-be/resources/config/application.properties @@ -22,7 +22,7 @@ spring.mvc.favicon.enabled=false # and in the values.yaml change the internalPort to 9517 # -spring.profiles.active=camel,http,fe-prod,oxm-schema-prod,oxm-default,resources,sync,portal +spring.profiles.active=camel,ssl,fe-prod,oxm-schema-prod,oxm-default,resources,sync,portal searchservice.hostname={{.Values.global.searchData.serviceName}} searchservice.port=9509 diff --git a/charts/aai-sparky-be/resources/config/auth/aai-os-cert.p12 b/charts/aai-sparky-be/resources/config/auth/aai-os-cert.p12 Binary files differdeleted file mode 100644 index ee57120..0000000 --- a/charts/aai-sparky-be/resources/config/auth/aai-os-cert.p12 +++ /dev/null diff --git a/charts/aai-sparky-be/resources/config/auth/org.onap.aai.p12 b/charts/aai-sparky-be/resources/config/auth/org.onap.aai.p12 Binary files differnew file mode 100644 index 0000000..71cea3e --- /dev/null +++ b/charts/aai-sparky-be/resources/config/auth/org.onap.aai.p12 diff --git a/charts/aai-sparky-be/resources/config/auth/tomcat_keystore b/charts/aai-sparky-be/resources/config/auth/tomcat_keystore Binary files differdeleted file mode 100644 index 9eec841..0000000 --- a/charts/aai-sparky-be/resources/config/auth/tomcat_keystore +++ /dev/null diff --git a/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks b/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks Binary files differnew file mode 100644 index 0000000..ff844b1 --- /dev/null +++ b/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks |