Skip to content

Commit 4f42793

Browse files
GiooDevGiooDev
committed
Story #15211: Keep cleaning.
1 parent c848368 commit 4f42793

File tree

10 files changed

+55
-55
lines changed

10 files changed

+55
-55
lines changed

‎deployment/roles/vitamui/tasks/main.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,20 +135,20 @@
135135

136136
- block: # when secure is true
137137

138-
- name: "Copy {{ vitamui_struct.service_name | default(service_name) }} jks keystore (server)"
138+
- name: "Copy {{ vitamui_struct.vitamui_component }} jks keystore (server)"
139139
copy:
140140
src: "{{ inventory_dir }}/keystores/vitamui-services/server/{{ vitamui_struct.vitamui_component }}/keystore_{{ vitamui_struct.vitamui_component }}.jks"
141-
dest: "{{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks"
141+
dest: "{{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks"
142142
owner: "{{ vitamui_defaults.users.vitamui }}"
143143
group: "{{ vitamui_defaults.users.group }}"
144144
mode: "{{ vitamui_defaults.folder.folder_permission }}"
145145
tags: update_vitamui_certificates
146146
notify: restart service
147147

148-
- name: "Copy {{ vitamui_struct.service_name | default(service_name) }} jks keystore (client)"
148+
- name: "Copy {{ vitamui_struct.vitamui_component }} jks keystore (client)"
149149
copy:
150150
src: "{{ inventory_dir }}/keystores/vitamui-services/clients/{{ vitamui_struct.vitamui_component }}/keystore_{{ vitamui_struct.vitamui_component }}.jks"
151-
dest: "{{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks"
151+
dest: "{{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks"
152152
owner: "{{ vitamui_defaults.users.vitamui }}"
153153
group: "{{ vitamui_defaults.users.group }}"
154154
mode: "{{ vitamui_defaults.folder.folder_permission }}"

‎deployment/roles/vitamui/templates/api-gateway/application.yml.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ server:
44
port: {{ vitamui_struct.server_port | default('8090') }}
55
{% if vitamui_struct.secure | default(secure) | bool == true %}
66
ssl:
7-
key-store: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
7+
key-store: {{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks
88
key-store-password: {{ password_keystore_server }}
99
key-password: {{ password_keystore_server }}
1010
trust-store: {{ vitamui_folder_conf }}/truststore_vitamui.jks

‎deployment/roles/vitamui/templates/archive-search/application.yml.j2‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ cas.tenant.identifier: {{ vitamui_platform_informations.cas_tenant }}
2222
server:
2323
address: {{ ip_service }}
2424
port: {{ vitamui_struct.port_service }}
25-
{% if vitamui_struct.secure | default(secure) | bool == true %}
25+
{% if vitamui_struct.secure | default(secure) | bool %}
2626
ssl:
27-
key-store: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
27+
key-store: {{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks
2828
key-store-password: {{ password_keystore_server }}
2929
key-password: {{ password_keystore_server }}
3030
trust-store: {{ vitamui_folder_conf }}/truststore_vitamui.jks
@@ -71,11 +71,11 @@ archive-search:
7171
secure: true
7272
ssl-configuration:
7373
keystore:
74-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
74+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
7575
key-password: {{ password_keystore_client }}
7676
truststore:
77-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
78-
key-password: {{ password_truststore }}
77+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
78+
key-password: {{ truststores_vitamui }}
7979
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
8080
{% endif %}
8181
iam-client:
@@ -85,11 +85,11 @@ archive-search:
8585
secure: true
8686
ssl-configuration:
8787
keystore:
88-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
88+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
8989
key-password: {{ password_keystore_client }}
9090
truststore:
91-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
92-
key-password: {{ password_truststore }}
91+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
92+
key-password: {{ truststores_vitamui }}
9393
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
9494
{% endif %}
9595

‎deployment/roles/vitamui/templates/cas-server/application.yml.j2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spring:
1717
server:
1818
{% if vitamui_struct.secure | default(secure) | bool == true %}
1919
ssl:
20-
key-store: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
20+
key-store: {{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks
2121
key-store-password: {{ password_keystore_server }}
2222
key-password: {{ password_keystore_server }}
2323
enabled-protocols: {{ssl_setting.enabled_protocols}}
@@ -67,11 +67,11 @@ iam-client:
6767
secure: {{ vitamui.iam.secure | default(secure) | lower }}
6868
ssl-configuration:
6969
keystore:
70-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
70+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
7171
key-password: {{ password_keystore_client }}
7272
truststore:
73-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
74-
key-password: {{ password_truststore }}
73+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
74+
key-password: {{ truststores_vitamui }}
7575
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
7676
{% endif %}
7777

‎deployment/roles/vitamui/templates/collect/application.yml.j2‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ cas.tenant.identifier: {{ vitamui_platform_informations.cas_tenant }}
3131
server:
3232
address: {{ ip_service }}
3333
port: {{ vitamui_struct.port_service }}
34-
{% if vitamui_struct.secure | default(secure) | bool == true %}
34+
{% if vitamui_struct.secure | default(secure) | bool %}
3535
ssl:
36-
key-store: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
36+
key-store: {{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks
3737
key-store-password: {{ password_keystore_server }}
3838
key-password: {{ password_keystore_server }}
3939
trust-store: {{ vitamui_folder_conf }}/truststore_vitamui.jks
@@ -80,11 +80,11 @@ collect:
8080
secure: true
8181
ssl-configuration:
8282
keystore:
83-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
83+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
8484
key-password: {{ password_keystore_client }}
8585
truststore:
86-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
87-
key-password: {{ password_truststore }}
86+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
87+
key-password: {{ truststores_vitamui }}
8888
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
8989
{% endif %}
9090
iam-client:
@@ -94,11 +94,11 @@ collect:
9494
secure: true
9595
ssl-configuration:
9696
keystore:
97-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
97+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
9898
key-password: {{ password_keystore_client }}
9999
truststore:
100-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
101-
key-password: {{ password_truststore }}
100+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
101+
key-password: {{ truststores_vitamui }}
102102
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
103103
{% endif %}
104104

‎deployment/roles/vitamui/templates/iam/application.yml.j2‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ logging:
2525
server:
2626
address: {{ ip_service }}
2727
port: {{ vitamui_struct.port_service }}
28-
{% if vitamui_struct.secure | default(secure) | bool == true %}
28+
{% if vitamui_struct.secure | default(secure) | bool %}
2929
ssl:
30-
key-store: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
30+
key-store: {{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks
3131
key-store-password: {{ password_keystore_server }}
3232
key-password: {{ password_keystore_server }}
3333
trust-store: {{ vitamui_folder_conf }}/truststore_vitamui.jks
@@ -76,11 +76,11 @@ iam:
7676
secure: true
7777
ssl-configuration:
7878
keystore:
79-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
79+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
8080
key-password: {{ password_keystore_client }}
8181
truststore:
82-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
83-
key-password: {{ password_truststore }}
82+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
83+
key-password: {{ truststores_vitamui }}
8484
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
8585
{% endif %}
8686

@@ -111,11 +111,11 @@ cas-client:
111111
secure: true
112112
ssl-configuration:
113113
keystore:
114-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
114+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
115115
key-password: {{ password_keystore_client }}
116116
truststore:
117-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
118-
key-password: {{ password_truststore }}
117+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
118+
key-password: {{ truststores_vitamui }}
119119
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
120120
{% endif %}
121121

‎deployment/roles/vitamui/templates/ingest/application.yml.j2‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ server:
1919
port: {{ vitamui_struct.port_service }}
2020
{% if vitamui_struct.secure | default(secure) | bool %}
2121
ssl:
22-
key-store: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
22+
key-store: {{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks
2323
key-store-password: {{ password_keystore_server }}
2424
key-password: {{ password_keystore_server }}
2525
trust-store: {{ vitamui_folder_conf }}/truststore_vitamui.jks
@@ -68,11 +68,11 @@ ingest:
6868
secure: true
6969
ssl-configuration:
7070
keystore:
71-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
71+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
7272
key-password: {{ password_keystore_client }}
7373
truststore:
74-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
75-
key-password: {{ password_truststore }}
74+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
75+
key-password: {{ truststores_vitamui }}
7676
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
7777
{% endif %}
7878
iam-client:
@@ -82,11 +82,11 @@ ingest:
8282
secure: true
8383
ssl-configuration:
8484
keystore:
85-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
85+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
8686
key-password: {{ password_keystore_client }}
8787
truststore:
88-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
89-
key-password: {{ password_truststore }}
88+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
89+
key-password: {{ truststores_vitamui }}
9090
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
9191
{% endif %}
9292

‎deployment/roles/vitamui/templates/pastis/application.yml.j2‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ server:
4242
port: {{ vitamui_struct.port_service }}
4343
{% if vitamui_struct.secure | default(secure) | bool %}
4444
ssl:
45-
key-store: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
45+
key-store: {{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks
4646
key-store-password: {{ password_keystore_server }}
4747
key-password: {{ password_keystore_server }}
4848
trust-store: {{ vitamui_folder_conf }}/truststore_vitamui.jks
@@ -90,11 +90,11 @@ pastis:
9090
secure: true
9191
ssl-configuration:
9292
keystore:
93-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
93+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
9494
key-password: {{ password_keystore_client }}
9595
truststore:
96-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
97-
key-password: {{ password_truststore }}
96+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
97+
key-password: {{ truststores_vitamui }}
9898
hostname-verification: {{ vitamui_defaults.services.ssl_hostname_verification | default(true) | bool | lower }}
9999
{% endif %}
100100
iam-client:
@@ -104,11 +104,11 @@ pastis:
104104
secure: true
105105
ssl-configuration:
106106
keystore:
107-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
107+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
108108
key-password: {{ password_keystore_client }}
109109
truststore:
110-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
111-
key-password: {{ password_truststore }}
110+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
111+
key-password: {{ truststores_vitamui }}
112112
hostname-verification: {{ vitamui_defaults.services.ssl_hostname_verification | default(true) | bool | lower }}
113113
{% endif %}
114114

‎deployment/roles/vitamui/templates/referential/application.yml.j2‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ server:
2828
port: {{ vitamui_struct.port_service }}
2929
{% if vitamui_struct.secure | default(secure) | bool == true %}
3030
ssl:
31-
key-store: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
31+
key-store: {{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks
3232
key-store-password: {{ password_keystore_server }}
3333
key-password: {{ password_keystore_server }}
3434
trust-store: {{ vitamui_folder_conf }}/truststore_vitamui.jks
@@ -76,11 +76,11 @@ referential:
7676
secure: true
7777
ssl-configuration:
7878
keystore:
79-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
79+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
8080
key-password: {{ password_keystore_client }}
8181
truststore:
82-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
83-
key-password: {{ password_truststore }}
82+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
83+
key-password: {{ truststores_vitamui }}
8484
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
8585
{% endif %}
8686
iam-client:
@@ -90,11 +90,11 @@ referential:
9090
secure: true
9191
ssl-configuration:
9292
keystore:
93-
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.service_name | default(service_name) }}.jks
93+
key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks
9494
key-password: {{ password_keystore_client }}
9595
truststore:
96-
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
97-
key-password: {{ password_truststore }}
96+
key-path: {{ vitamui_folder_conf }}/truststore_vitamui.jks
97+
key-password: {{ truststores_vitamui }}
9898
hostname-verification: {{ vitamui_struct.ssl_hostname_verification | default(ssl_hostname_verification) | lower }}
9999
{% endif %}
100100

‎deployment/roles/vitamui/templates/security/application.yml.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ server:
2525
port: {{ vitamui_struct.port_service }}
2626
{% if vitamui_struct.secure | default(secure) | bool == true %}
2727
ssl:
28-
key-store: {{ vitamui_folder_conf }}/keystore_{{ vitamui_struct.service_name | default(service_name) }}.jks
28+
key-store: {{ vitamui_folder_conf }}/keystore_server_{{ vitamui_struct.vitamui_component }}.jks
2929
key-store-password: {{ password_keystore_server }}
3030
key-password: {{ password_keystore_server }}
3131
trust-store: {{ vitamui_folder_conf }}/truststore_vitamui.jks

0 commit comments

Comments
 (0)