From cd7a57cb4be85ab5e633e628227c4812dfc11124 Mon Sep 17 00:00:00 2001 From: "Arul.Nambi" Date: Wed, 5 Dec 2018 14:06:30 -0500 Subject: Updating the certs for AAF Issue-ID: AAI-1992 Change-Id: I4082dc9f1f9ddf92b4534e47c0dceb53ed6121c4 Signed-off-by: Arul.Nambi --- .../resources/config/application-ssl.properties | 7 +++++-- .../resources/config/application.properties | 2 +- .../resources/config/auth/aai-os-cert.p12 | Bin 4357 -> 0 bytes .../resources/config/auth/org.onap.aai.p12 | Bin 0 -> 4307 bytes .../resources/config/auth/tomcat_keystore | Bin 2214 -> 0 bytes .../resources/config/auth/truststoreONAPall.jks | Bin 0 -> 117990 bytes 6 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 kubernetes/aai/charts/aai-sparky-be/resources/config/auth/aai-os-cert.p12 create mode 100644 kubernetes/aai/charts/aai-sparky-be/resources/config/auth/org.onap.aai.p12 delete mode 100644 kubernetes/aai/charts/aai-sparky-be/resources/config/auth/tomcat_keystore create mode 100644 kubernetes/aai/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks (limited to 'kubernetes') diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/application-ssl.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/application-ssl.properties index 04a5096c0c..2ea1bf15ed 100644 --- a/kubernetes/aai/charts/aai-sparky-be/resources/config/application-ssl.properties +++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-sparky-be/resources/config/application.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/application.properties index aa93c06bca..da4812c646 100644 --- a/kubernetes/aai/charts/aai-sparky-be/resources/config/application.properties +++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/aai-os-cert.p12 b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/aai-os-cert.p12 deleted file mode 100644 index ee57120fa0..0000000000 Binary files a/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/aai-os-cert.p12 and /dev/null differ diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/org.onap.aai.p12 b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/org.onap.aai.p12 new file mode 100644 index 0000000000..71cea3e57c Binary files /dev/null and b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/org.onap.aai.p12 differ diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/tomcat_keystore deleted file mode 100644 index 9eec841aa2..0000000000 Binary files a/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/tomcat_keystore and /dev/null differ diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks new file mode 100644 index 0000000000..ff844b109d Binary files /dev/null and b/kubernetes/aai/charts/aai-sparky-be/resources/config/auth/truststoreONAPall.jks differ -- cgit 1.2.3-korg