Skip to content
Snippets Groups Projects
Commit b8bf63bd authored by Mathieu Leguay's avatar Mathieu Leguay Committed by Makhtar DIAGNE
Browse files

[DEVOPS] Update scripts for deployment

parent 7ac5c315
No related branches found
No related tags found
1 merge request!1Feature/design/1
...@@ -56,8 +56,9 @@ vitamui: ...@@ -56,8 +56,9 @@ vitamui:
logback_total_size_cap: "5GB" logback_total_size_cap: "5GB"
root_log_level: "ERROR" root_log_level: "ERROR"
vitamui_level: "INFO" vitamui_level: "INFO"
# Custom directories linked to the module
dirs: dirs:
assets: "/tmp/assets" - "{{ vitam_defaults.folder.root_path }}/conf/assets"
identity_admin: identity_admin:
host: "identity-admin.service.consul" host: "identity-admin.service.consul"
vitamui_component: "ui-identity-admin" vitamui_component: "ui-identity-admin"
...@@ -76,8 +77,9 @@ vitamui: ...@@ -76,8 +77,9 @@ vitamui:
logback_total_size_cap: "5GB" logback_total_size_cap: "5GB"
root_log_level: "ERROR" root_log_level: "ERROR"
vitamui_level: "INFO" vitamui_level: "INFO"
# Custom directories linked to the module
dirs: dirs:
assets: "/tmp/assets" - "{{ vitam_defaults.folder.root_path }}/conf/assets"
portal: portal:
host: "portal.service.consul" host: "portal.service.consul"
vitamui_component: "ui-portal" vitamui_component: "ui-portal"
...@@ -96,8 +98,9 @@ vitamui: ...@@ -96,8 +98,9 @@ vitamui:
logback_total_size_cap: "5GB" logback_total_size_cap: "5GB"
root_log_level: "ERROR" root_log_level: "ERROR"
vitamui_level: "INFO" vitamui_level: "INFO"
# Custom directories linked to the module
dirs: dirs:
assets: "/tmp/assets" - "{{ vitam_defaults.folder.root_path }}/conf/assets"
iam_external: iam_external:
host: "iam-external.service.consul" host: "iam-external.service.consul"
vitamui_component: "iam-external" vitamui_component: "iam-external"
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
tags: tags:
- update_vitam_configuration - update_vitam_configuration
notify: notify:
<<<<<<< HEAD
- restart service - restart service
- name: Deploy customer-init.yml - name: Deploy customer-init.yml
...@@ -24,4 +25,6 @@ ...@@ -24,4 +25,6 @@
tags: tags:
- update_vitam_configuration - update_vitam_configuration
notify: notify:
=======
>>>>>>> [DEVOPS] Update scripts for deployment
- restart service - restart service
\ No newline at end of file
...@@ -141,21 +141,9 @@ ...@@ -141,21 +141,9 @@
notify: notify:
- restart service - restart service
- name: "Copy vitam certificates" - name: "Execute sub-tasks for the component type: {{ vitamui_struct.vitamui_component_type }}"
copy: include_tasks: "{{ vitamui_struct.vitamui_component_type }}.yml"
src: "{{ item }}" when: "{{ lookup('pipe', 'test -f {{ role_path }}/tasks/{{ vitamui_struct.vitamui_component_type }}.yml || echo nofile') == \"\" }}"
dest: "{{ vitamui_folder_conf }}/{{ item | basename }}"
owner: "{{ vitamui_defaults.users.vitamui }}"
group: "{{ vitamui_defaults.users.group }}"
mode: "{{ vitamui_defaults.folder.folder_permission }}"
with_fileglob:
- "{{ inventory_dir }}/keystores/client-vitam/*.*"
when:
- vitam_cert is defined
tags:
- update_vitam_configuration
notify:
- restart service
- name: "Execute sub-tasks for the component: {{ vitamui_struct.vitamui_component }}" - name: "Execute sub-tasks for the component: {{ vitamui_struct.vitamui_component }}"
include_tasks: "{{ vitamui_struct.vitamui_component }}.yml" include_tasks: "{{ vitamui_struct.vitamui_component }}.yml"
......
...@@ -62,7 +62,7 @@ ui-identity: ...@@ -62,7 +62,7 @@ ui-identity:
key-password: {{ password_truststore }} # TODO OMA : revoir key-password: {{ password_truststore }} # TODO OMA : revoir
hostname-verification: false hostname-verification: false
{% endif %} {% endif %}
assets: "{{ vitamui_struct.ui_identity_admin.dirs.assets }}" assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
base-url: base-url:
{% if vitamui.portal.base_url is defined %} {% if vitamui.portal.base_url is defined %}
portal: "{{ vitamui.portal.base_url }}" portal: "{{ vitamui.portal.base_url }}"
......
...@@ -59,7 +59,7 @@ ui-identity: ...@@ -59,7 +59,7 @@ ui-identity:
key-password: {{ password_truststore }} key-password: {{ password_truststore }}
hostname-verification: false hostname-verification: false
{%endif %} {%endif %}
assets: "{{ vitamui_struct.ui_identity.dirs.assets }}" assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
base-url: base-url:
{% if vitamui.portal.base_url is defined %} {% if vitamui.portal.base_url is defined %}
portal: "{{ vitamui.portal.base_url }}" portal: "{{ vitamui.portal.base_url }}"
......
...@@ -54,7 +54,7 @@ ui-portal: ...@@ -54,7 +54,7 @@ ui-portal:
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
key-password: {{ password_truststore }} # TODO OMA : revoir key-password: {{ password_truststore }} # TODO OMA : revoir
hostname-verification: false hostname-verification: false
assets: "{{ vitamui_struct.ui_portal.dirs.assets }}" assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
{% endif %} {% endif %}
{% if vitamui.portal.base_url is undefined %} {% if vitamui.portal.base_url is undefined %}
base-url: base-url:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment