diff --git a/deployment/environments/group_vars/all/vitamui_vars.yml b/deployment/environments/group_vars/all/vitamui_vars.yml index d5e299ac43edb832ff7a22bf1671e6f2f08bc18f..612837c1f2313005c3f8b63cc3dbf1b5566ca993 100755 --- a/deployment/environments/group_vars/all/vitamui_vars.yml +++ b/deployment/environments/group_vars/all/vitamui_vars.yml @@ -164,7 +164,7 @@ vitamui: vitamui_level: "INFO" reset_password_url: /cas/extras/resetPassword?username={username}&firstname={firstname}&lastname={lastname}&language={language}&ttl=1day security_internal: - host: "security-internal.service.consul" + host: "vitamui-security-internal.service.consul" vitamui_component: "security-internal" vitamui_component_type: "internal" package_name: "vitamui-security-internal" @@ -197,6 +197,9 @@ vitamui_platform_informations: proof_tenant: 3 cas_tenant: -1 first_customer_tenant: 9 + theme_colors: + vitamui_primary: "#ff4a54" + vitamui_secondary: "#241f63" mongodb: included_scripts: diff --git a/deployment/roles/vitamui/files/ui/assets/logo-large.png b/deployment/roles/vitamui/files/ui/assets/logo-large.png new file mode 100644 index 0000000000000000000000000000000000000000..ae1e31c5eacc2de20bf59e557d09c109d7eab4ff Binary files /dev/null and b/deployment/roles/vitamui/files/ui/assets/logo-large.png differ diff --git a/deployment/roles/vitamui/tasks/main.yml b/deployment/roles/vitamui/tasks/main.yml index aad7ad14a9a5b16b103e339ea112726957eea4fa..2cc213674c7642adff1dce829ab83e7d1bfafbb4 100644 --- a/deployment/roles/vitamui/tasks/main.yml +++ b/deployment/roles/vitamui/tasks/main.yml @@ -89,6 +89,8 @@ mode: "{{ vitamui_defaults.folder.conf_permission }}" with_items: - "logback.xml" + tags: + - update_vitam_configuration - name: Deploy specific configuration files template: diff --git a/deployment/roles/vitamui/templates/cas-server/application.yml.j2 b/deployment/roles/vitamui/templates/cas-server/application.yml.j2 index c9ece05e12f8ff8101fc04ac4e5af77696e63dba..cdcad26e78dbabe36a410eec7f0121f62f28d8c4 100644 --- a/deployment/roles/vitamui/templates/cas-server/application.yml.j2 +++ b/deployment/roles/vitamui/templates/cas-server/application.yml.j2 @@ -173,10 +173,10 @@ server-identity: # Example to override theme colors and logo theme: -# vitam-logo: /absolute/path/to/logo.png -# vitamui-logo-large: /absolute/path/to/logo.png - primary: '#ff4a54' - secondary: '#241f63' +# vitam-logo: {{ vitamui_defaults.folder.root_path }}/conf/assets/logo.png +# vitamui-logo-large: {{ vitamui_defaults.folder.root_path }}/conf/assets/logo-large.png + primary: '{{ vitamui_platform_informations.theme_colors.vitamui_primary }}' + secondary: '{{ vitamui_platform_informations.theme_colors.vitamui_secondary }}' logging: config: {{ vitamui_folder_conf }}/logback.xml diff --git a/deployment/roles/vitamui/templates/security-internal/application.yml.j2 b/deployment/roles/vitamui/templates/security-internal/application.yml.j2 index b462b4a0e6382edbf590c5e16dfd4b0dde74a47d..8e79b8c6e416220de1cc8b41be769ad4cde0644d 100644 --- a/deployment/roles/vitamui/templates/security-internal/application.yml.j2 +++ b/deployment/roles/vitamui/templates/security-internal/application.yml.j2 @@ -13,7 +13,7 @@ spring: server-identity: identityName: {{ vitamui_site_name }} - identityRole: {{ vitamui_struct.vitamui_component }} + identityRole: vitamui-{{ vitamui_struct.vitamui_component }} identityServerId: 1 logging: diff --git a/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2 index f3f9346cdb39e603a92f439459a6e946ffa662cc..71a85f27dabdb73bda6ed06025782648a6756c50 100644 --- a/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2 +++ b/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2 @@ -64,8 +64,8 @@ ui-identity: {% endif %} assets: "{{ vitamui_defaults.folder.root_path }}/conf/assets" theme-colors: - vitamui-primary: "#ff4a54" - vitamui-secondary: "#241f63" + vitamui-primary: "{{ vitamui_platform_informations.theme_colors.vitamui_primary }}" + vitamui-secondary: "{{ vitamui_platform_informations.theme_colors.vitamui_secondary }}" base-url: {% if vitamui.portal.base_url is defined %} portal: "{{ vitamui.portal.base_url }}" diff --git a/deployment/roles/vitamui/templates/ui-identity/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity/application.yml.j2 index 3dfd2e86c18a5dfa59e26b7810c929045e5d60cb..aba55342916a96cc768e9da2c810e3ae1918ddc2 100644 --- a/deployment/roles/vitamui/templates/ui-identity/application.yml.j2 +++ b/deployment/roles/vitamui/templates/ui-identity/application.yml.j2 @@ -61,8 +61,8 @@ ui-identity: {%endif %} assets: "{{ vitamui_defaults.folder.root_path }}/conf/assets" theme-colors: - vitamui-primary: "#ff4a54" - vitamui-secondary: "#241f63" + vitamui-primary: "{{ vitamui_platform_informations.theme_colors.vitamui_primary }}" + vitamui-secondary: "{{ vitamui_platform_informations.theme_colors.vitamui_secondary }}" base-url: {% if vitamui.portal.base_url is defined %} portal: "{{ vitamui.portal.base_url }}" diff --git a/deployment/roles/vitamui/templates/ui-portal/application.yml.j2 b/deployment/roles/vitamui/templates/ui-portal/application.yml.j2 index 8c1451d6289029bb0bcbaf4e5c325dfba9baaf1d..2aa1929987b5e6454c3ad2134c136b788967d8be 100644 --- a/deployment/roles/vitamui/templates/ui-portal/application.yml.j2 +++ b/deployment/roles/vitamui/templates/ui-portal/application.yml.j2 @@ -57,8 +57,8 @@ ui-portal: {% endif %} assets: "{{ vitamui_defaults.folder.root_path }}/conf/assets" theme-colors: - vitamui-primary: "#ff4a54" - vitamui-secondary: "#241f63" + vitamui-primary: "{{ vitamui_platform_informations.theme_colors.vitamui_primary }}" + vitamui-secondary: "{{ vitamui_platform_informations.theme_colors.vitamui_secondary }}" {% if vitamui.portal.base_url is undefined %} base-url: portal: "{{ url_prefix }}" # TODO OMA : revoir avec les redirections du RP