Story #15211: separate client and server certificate

Author: mkhediri

api/api-archive-search/archive-search/src/main/resources/application-dev.yml

@@ -25,10 +25,10 @@ server:
   host:
   port: 8089
   ssl:
-    key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_archive-search.jks
+    key-store: ../../../dev-deployment/environments/keystores/vitamui-services/server/archive-search/keystore_archive-search.jks
     key-store-password: changeme
     key-password: changeme
-    trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+    trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
     trust-store-password: changeme
     client-auth: want
     enabled-protocols: TLSv1.2,TLSv1.3
@@ -53,10 +53,10 @@ archive-search:
     secure: true
     ssl-configuration:
       truststore:
-        key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
         key-password: changeme
       keystore:
-        key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_archive-search.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/archive-search/keystore_archive-search.jks
         key-password: changeme
         type: JKS
       hostname-verification: false

api/api-archive-search/archive-search/src/test/resources/application.yml

@@ -24,10 +24,10 @@ archive-search:
     secure: true
     ssl-configuration:
       truststore:
-        key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
         key-password: changeme
       keystore:
-        key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_archive-search.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/server/archive-search/keystore_archive-search.jks
         key-password: changeme
         type: JKS
       hostname-verification: false

api/api-collect/collect/src/main/resources/application-dev.yml

@@ -25,10 +25,10 @@ server:
   host:
   port: 8090
   ssl:
-    key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_collect.jks
+    key-store: ../../../dev-deployment/environments/keystores/vitamui-services/server/collect/keystore_collect.jks
     key-store-password: changeme
     key-password: changeme
-    trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+    trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
     trust-store-password: changeme
     client-auth: want
     enabled-protocols: TLSv1.2,TLSv1.3
@@ -51,10 +51,10 @@ collect:
     secure: true
     ssl-configuration:
       truststore:
-        key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
         key-password: changeme
       keystore:
-        key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_collect.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/collect/keystore_collect.jks
         key-password: changeme
         type: JKS
       hostname-verification: false

api/api-gateway/src/main/resources/application-dev.yml

@@ -1,11 +1,11 @@
 server:
   port: 8070
   ssl:
-    key-store: ../../dev-deployment/environments/keystores/server/localhost/keystore_api-gateway.jks
+    key-store: ../../dev-deployment/environments/keystores/vitamui-services/server/api-gateway/keystore_api-gateway.jks
     key-store-password: changeme
     key-password: changeme
     client-auth: need
-    trust-store: ../../dev-deployment/environments/keystores/server/truststore_server.jks
+    trust-store: ../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
     trust-store-password: changeme
   max-http-request-header-size: 16KB
 

api/api-iam/iam/src/main/resources/application-dev.yml

@@ -22,10 +22,10 @@ server:
   host:
   port: 8083
   ssl:
-    key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam.jks
+    key-store: ../../../dev-deployment/environments/keystores/vitamui-services/server/iam/keystore_iam.jks
     key-store-password: changeme
     key-password: changeme
-    trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+    trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
     trust-store-password: changeme
     client-auth: want
     enabled-protocols: TLSv1.2,TLSv1.3
@@ -53,10 +53,10 @@ cas-client:
   secure: true
   ssl-configuration:
     truststore:
-      key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+      key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
       key-password: changeme
     keystore:
-      key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam.jks
+      key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/iam/keystore_iam.jks
       key-password: changeme
       type: JKS
     hostname-verification: false
@@ -112,11 +112,11 @@ provisioning-client:
         secure: false
         ssl-configuration:
           keystore:
-            key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam.jks
+            key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/iam/keystore_iam.jks
             key-password: changeme
             type: JKS
           truststore:
-            key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+            key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
             key-password: changeme
             type: JKS
           hostname-verification: false
@@ -126,11 +126,11 @@ provisioning-client:
         secure: true
         ssl-configuration:
           keystore:
-            key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam.jks
+            key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/iam/keystore_iam.jks
             key-password: changeme
             type: JKS
           truststore:
-            key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+            key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
             key-password: changeme
             type: JKS
           hostname-verification: false

api/api-iam/iam/src/test/resources/application.yml

@@ -62,10 +62,10 @@ cas-client:
   secure: true
   ssl-configuration:
     truststore:
-      key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+      key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
       key-password: changeme
     keystore:
-      key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam.jks
+      key-path: ../../../dev-deployment/environments/keystores/vitamui-services/server/iam/keystore_iam.jks
       key-password: changeme
       type: JKS
     hostname-verification: false

api/api-ingest/ingest/src/main/resources/application-dev.yml

@@ -15,10 +15,10 @@ server:
   host:
   port: 8088
   ssl:
-    key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_ingest.jks
+    key-store: ../../../dev-deployment/environments/keystores/vitamui-services/server/ingest/keystore_ingest.jks
     key-store-password: changeme
     key-password: changeme
-    trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+    trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
     trust-store-password: changeme
     client-auth: want
     enabled-protocols: TLSv1.2,TLSv1.3
@@ -43,10 +43,10 @@ ingest:
     secure: true
     ssl-configuration:
       truststore:
-        key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
         key-password: changeme
       keystore:
-        key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_ingest.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/ingest/keystore_ingest.jks
         key-password: changeme
         type: JKS
       hostname-verification: false

api/api-ingest/ingest/src/test/resources/application.yml

@@ -24,10 +24,10 @@ ingest:
     secure: true
     ssl-configuration:
       truststore:
-        key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
         key-password: changeme
       keystore:
-        key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_archive-search.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/server/archive-search/keystore_archive-search.jks
         key-password: changeme
         type: JKS
       hostname-verification: false

api/api-pastis/pastis/src/main/resources/application-dev.yml

@@ -35,10 +35,10 @@ server:
   host:
   port: 8015
   ssl:
-    key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_pastis.jks
+    key-store: ../../../dev-deployment/environments/keystores/vitamui-services/server/pastis/keystore_pastis.jks
     key-store-password: changeme
     key-password: changeme
-    trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+    trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
     trust-store-password: changeme
     client-auth: want
     enabled-protocols: TLSv1.1,TLSv1.2,TLSv1.3
@@ -62,10 +62,10 @@ pastis:
     secure: true
     ssl-configuration:
       truststore:
-        key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
         key-password: changeme
       keystore:
-        key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_pastis.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/pastis/keystore_pastis.jks
         key-password: changeme
         type: JKS
       hostname-verification: false

api/api-referential/referential/src/main/resources/application-dev.yml

@@ -19,10 +19,10 @@ server:
   port: 8087
   tomcat.connection-timeout: 60000
   ssl:
-    key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_referential.jks
+    key-store: ../../../dev-deployment/environments/keystores/vitamui-services/server/referential/keystore_referential.jks
     key-store-password: changeme
     key-password: changeme
-    trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+    trust-store: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
     trust-store-password: changeme
     client-auth: want
     enabled-protocols: TLSv1.2,TLSv1.3
@@ -49,10 +49,10 @@ referential:
     secure: true
     ssl-configuration:
       truststore:
-        key-path: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/truststore_vitamui.jks
         key-password: changeme
       keystore:
-        key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_referential.jks
+        key-path: ../../../dev-deployment/environments/keystores/vitamui-services/clients/referential/keystore_referential.jks
         key-password: changeme
         type: JKS
       hostname-verification: false