Skip to content

Commit 9ef574c

Browse files
GiooDevGiooDev
committed
Story #15211: separate client and server certificate
1 parent f7489f7 commit 9ef574c

File tree

32 files changed

+375
-254
lines changed

32 files changed

+375
-254
lines changed

‎deployment/ansible-vitamui/app_api_gateway.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
vars:
99
vitamui_struct: "{{ vitamui.api_gateway }}"
1010
vitamui_certificate_type: external
11-
password_keystore: "{{ keystores_server_api_gateway }}"
11+
password_keystore_server: "{{ keystores_server_vitamui_services_api_gateway }}"
12+
password_keystore_client: "{{ keystores_client_vitamui_services_api_gateway }}"
1213
password_truststore: "{{ truststores_client_external }}"
1314
vitam_cert: "{{ vitam_certs.vitamui }}"
1415
consul_tags: "api-gateway, api, internal"

‎deployment/ansible-vitamui/app_archive_search.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
vars:
88
vitamui_struct: "{{ vitamui.archive_search_internal }}"
99
vitamui_certificate_type: server
10-
password_keystore: "{{ keystores_server_archive_search_internal }}"
11-
password_truststore: "{{ truststores_server }}"
10+
password_keystore_server: "{{ keystores_server_vitamui_services_archive_search_internal }}"
11+
password_truststore: "{{ truststores_vitamui }}"
1212
vitam_cert: "{{ vitam_certs.vitamui }}"
1313
consul_tags: "archive-search-internal, api, internal"
1414

@@ -21,6 +21,7 @@
2121
vars:
2222
vitamui_struct: "{{ vitamui.archive_search_external }}"
2323
vitamui_certificate_type: external
24-
password_keystore: "{{ keystores_server_archive_search_external }}"
24+
password_keystore_client: "{{ keystores_client_vitamui_services_archive_search_external }}"
25+
password_keystore_server: "{{ keystores_server_vitamui_services_archive_search_external }}"
2526
password_truststore: "{{ truststores_client_external }}"
2627
consul_tags: "archive-search-external, api, external"

‎deployment/ansible-vitamui/app_collect.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
vars:
88
vitamui_struct: "{{ vitamui.collect_internal }}"
99
vitamui_certificate_type: server
10-
password_keystore: "{{ keystores_server_collect_internal }}"
11-
password_truststore: "{{ truststores_server }}"
10+
password_keystore_server: "{{ keystores_server_vitamui_services_collect }}"
11+
password_truststore: "{{ truststores_vitamui }}"
1212
vitam_cert: "{{ vitam_certs.vitamui }}"
1313
consul_tags: "collect-internal, api, internal"
1414

@@ -21,6 +21,7 @@
2121
vars:
2222
vitamui_struct: "{{ vitamui.collect_external }}"
2323
vitamui_certificate_type: external
24-
password_keystore: "{{ keystores_server_collect_external }}"
24+
password_keystore_server: "{{ keystores_server_vitamui_services_collect }}"
25+
password_keystore_client: "{{ keystores_client_vitamui_services_collect }}"
2526
password_truststore: "{{ truststores_client_external }}"
2627
consul_tags: "collect-external, api, external"

‎deployment/ansible-vitamui/app_ingest.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
vars:
88
vitamui_struct: "{{ vitamui.ingest_internal }}"
99
vitamui_certificate_type: server
10-
password_keystore: "{{ keystores_server_ingest_internal }}"
11-
password_truststore: "{{ truststores_server }}"
10+
password_keystore_server: "{{ keystores_server_vitamui_services_ingest_internal }}"
11+
password_truststore: "{{ truststores_vitamui }}"
1212
vitam_cert: "{{ vitam_certs.vitamui }}"
1313
consul_tags: "ingest-internal, api, internal"
1414

@@ -21,6 +21,7 @@
2121
vars:
2222
vitamui_struct: "{{ vitamui.ingest_external }}"
2323
vitamui_certificate_type: external
24-
password_keystore: "{{ keystores_server_ingest_external }}"
24+
password_keystore_server: "{{ keystores_server_vitamui_services_ingest_external }}"
25+
password_keystore_client: "{{ keystores_client_vitamui_services_ingest_external }}"
2526
password_truststore: "{{ truststores_client_external }}"
2627
consul_tags: "ingest-external, api, external"

‎deployment/ansible-vitamui/app_pastis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
vars:
88
vitamui_struct: "{{ vitamui.pastis_external }}"
99
vitamui_certificate_type: external
10-
password_keystore: "{{ keystores_server_pastis_external }}"
10+
password_keystore_server: "{{ keystores_server_vitamui_services_pastis_external }}"
11+
password_keystore_client: "{{ keystores_client_vitamui_services_pastis_external }}"
1112
password_truststore: "{{ truststores_client_external }}"
1213
consul_tags: "pastis-external, api, external"
1314
vitam_cert: "{{ vitam_certs.vitamui }}"

‎deployment/ansible-vitamui/app_referential.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
vars:
88
vitamui_struct: "{{ vitamui.referential_internal }}"
99
vitamui_certificate_type: server
10-
password_keystore: "{{ keystores_server_referential_internal }}"
11-
password_truststore: "{{ truststores_server }}"
10+
password_keystore_server: "{{ keystores_server_vitamui_services_referential_internal }}"
11+
password_truststore: "{{ truststores_vitamui }}"
1212
vitam_cert: "{{ vitam_certs.vitamui }}"
1313
consul_tags: "referential-internal, api, internal"
1414

@@ -21,6 +21,7 @@
2121
vars:
2222
vitamui_struct: "{{ vitamui.referential_external }}"
2323
vitamui_certificate_type: external
24-
password_keystore: "{{ keystores_server_referential_external }}"
24+
password_keystore_server: "{{ keystores_server_vitamui_services_referential_external }}"
25+
password_keystore_client: "{{ keystores_client_vitamui_services_referential_external }}"
2526
password_truststore: "{{ truststores_client_external }}"
2627
consul_tags: "referential-external, api, external"

‎deployment/ansible-vitamui/vitamui_apps.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
- vitamui
99
vars:
1010
vitamui_struct: "{{ vitamui.iam_internal }}"
11-
vitamui_certificate_type: "server"
12-
password_keystore: "{{ keystores_server_iam_internal }}"
13-
password_truststore: "{{ truststores_server }}"
11+
vitamui_certificate_type: server
12+
password_keystore_server: "{{ keystores_server_vitamui_services_iam_internal }}"
13+
password_truststore: "{{ truststores_vitamui }}"
1414
vitam_cert: "{{ vitam_certs.vitamui }}"
1515
consul_tags: "iam-internal, api, internal"
1616
tags:
@@ -23,9 +23,9 @@
2323
- vitamui
2424
vars:
2525
vitamui_struct: "{{ vitamui.security_internal }}"
26-
vitamui_certificate_type: "server"
27-
password_keystore: "{{ keystores_server_security_internal }}"
28-
password_truststore: "{{ truststores_server }}"
26+
vitamui_certificate_type: server
27+
password_keystore_server: "{{ keystores_server_vitamui_services_security_internal }}"
28+
password_truststore: "{{ truststores_vitamui }}"
2929
consul_tags: "security-internal, api, internal"
3030
tags:
3131
- security-internal
@@ -38,8 +38,9 @@
3838
- vitamui
3939
vars:
4040
vitamui_struct: "{{ vitamui.iam_external }}"
41-
vitamui_certificate_type: "external"
42-
password_keystore: "{{ keystores_server_iam_external }}"
41+
vitamui_certificate_type: external
42+
password_keystore_server: "{{ keystores_server_vitamui_services_iam_external }}"
43+
password_keystore_client: "{{ keystores_client_vitamui_services_iam_external }}"
4344
password_truststore: "{{ truststores_client_external }}"
4445
consul_tags: "iam-external, api, external"
4546
tags:
@@ -53,8 +54,9 @@
5354
- vitamui
5455
vars:
5556
vitamui_struct: "{{ vitamui.cas_server }}"
56-
vitamui_certificate_type: "external"
57-
password_keystore: "{{ keystores_server_cas_server }}"
57+
vitamui_certificate_type: external
58+
password_keystore_server: "{{ keystores_server_vitamui_services_cas_server }}"
59+
password_keystore_client: "{{ keystores_client_vitamui_services_cas_server }}"
5860
password_truststore: "{{ truststores_client_external }}"
5961
consul_tags: "cas-server, cas, external"
6062
tags:

‎deployment/pki/config/crt-config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ issuerAltName = issuer:copy
5454
subjectAltName = ${ENV::OPENSSL_SAN}
5555
basicConstraints = critical,CA:FALSE
5656
keyUsage = digitalSignature, keyEncipherment
57-
nsCertType = server, client
58-
extendedKeyUsage = serverAuth, clientAuth
57+
nsCertType = server
58+
extendedKeyUsage = serverAuth
5959

6060
[ extension_client ]
6161
nsComment = "Certificat Client SSL"

‎deployment/pki/scripts/generate_ca.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set -e
1212
######################################################################
1313

1414
function get_autorities() {
15-
echo "server client-external client-vitam"
15+
echo "vitamui-services client-external client-vitam"
1616
}
1717

1818
######################################################################

‎deployment/pki/scripts/generate_ca_dev.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set -e
1414
REPERTOIRE_ROOT="$( cd "$( readlink -f $(dirname ${BASH_SOURCE[0]}) )/../../../dev-deployment" ; pwd )"
1515

1616
function get_autorities() {
17-
echo "server client-external client-vitam"
17+
echo "vitamui-services client-external client-vitam"
1818
}
1919

2020
######################################################################

0 commit comments

Comments
 (0)