Story #15211: Fixing cas-server resolution while starting.

Disable ssl for ui-design-system.

Author: GiooDev

deployment/pki/scripts/generate_certs.sh

@@ -43,7 +43,6 @@ function generateCerts {
     generateServerAndClientCertAndStorePassphrase   ui-archive-search   vitamui-services
     generateServerAndClientCertAndStorePassphrase   ui-collect          vitamui-services
     generateServerAndClientCertAndStorePassphrase   ui-pastis           vitamui-services
-    generateServerCertAndStorePassphrase            ui-design-system    vitamui-services
 
     #Reverse
     generateServerCertAndStorePassphrase            reverse             vitamui-services

deployment/pki/scripts/generate_certs_dev.sh

@@ -53,7 +53,6 @@ function generateCerts {
     generateServerAndClientCertAndStorePassphrase   ui-archive-search   vitamui-services
     generateServerAndClientCertAndStorePassphrase   ui-pastis           vitamui-services
     generateServerAndClientCertAndStorePassphrase   ui-collect          vitamui-services
-    generateServerCertAndStorePassphrase            ui-design-system    vitamui-services
 
     #Reverse
     generateServerCertAndStorePassphrase            reverse             vitamui-services

deployment/roles/nginx_webapp/tasks/install.yml

@@ -90,20 +90,21 @@
         mode: "{{ vitamui_defaults.folder.conf_permission }}"
       notify: reload nginx
 
+    #### Consul configuration ####
+    # Currently not needed as we don't use consul dns resolution for the upstream configuration
+    # - name: "Deploy consul agent service declaration for {{ vitamui_struct.vitamui_component }} service"
+    #   template:
+    #     src: service-componentid.json.j2
+    #     dest: "{{ consul.conf_folder | default(consul_folder_conf) }}/service-{{ vitamui_struct.vitamui_component }}.json"
+    #     owner: "{{ vitam_defaults.users.vitam }}"
+    #     group: "{{ vitam_defaults.users.group }}"
+    #     mode: "{{ '0644' if install_mode == 'container' else vitam_defaults.folder.conf_permission }}"
+    #   tags: consul_conf
+    #   notify: nginx_webapp - reload consul configuration
+
   when: vitamui_struct.secure | default(secure) | bool
 
 - name: Ensure nginx is started
   systemd:
     name: nginx
     state: started
-
-#### Consul configuration ####
-- name: "Deploy consul agent service declaration for {{ vitamui_struct.vitamui_component }} service"
-  template:
-    src: service-componentid.json.j2
-    dest: "{{ consul.conf_folder | default(consul_folder_conf) }}/service-{{ vitamui_struct.vitamui_component }}.json"
-    owner: "{{ vitam_defaults.users.vitam }}"
-    group: "{{ vitam_defaults.users.group }}"
-    mode: "{{ '0644' if install_mode == 'container' else vitam_defaults.folder.conf_permission }}"
-  tags: consul_conf
-  notify: nginx_webapp - reload consul configuration

deployment/roles/reverse/templates/nginx/conf.d/vhosts.conf.j2

@@ -143,12 +143,7 @@ server {
   # DESIGN SYSTEM
   location /design-system {
     rewrite /design-system/(.*) /$1 break;
-    # set $ui_design_system_dns "vitamui-{{ vitamui.ui_design_system.vitamui_component }}.service.{{ consul_domain }}";
-    # proxy_ssl_name $ui_design_system_dns;
-    # proxy_set_header Host $ui_design_system_dns;
-    # proxy_pass {{ 'https' if vitamui.ui_design_system.secure | default(secure) | bool else 'http' }}://$ui_design_system_dns:{{ vitamui.ui_design_system.port_service }};
-
-    proxy_pass {{ 'https' if vitamui.ui_design_system.secure | default(secure) | bool else 'http' }}://DESIGN_SYSTEM;
+    proxy_pass http://DESIGN_SYSTEM;
     include {{ nginx_conf_dir }}/proxy_params;
   }
 {% endif %}
@@ -160,8 +155,6 @@ server {
 
   location ~ ^/cas/(login|logout|extras|webjars|css|icons|favicon|images|js|serviceValidate|oauth2.0|clientredirect|oidc) {
     set $cas_server_dns "vitamui-{{ vitamui.cas_server.vitamui_component }}.service.{{ consul_domain }}";
-    # proxy_ssl_name $cas_server_dns;
-    # proxy_set_header Host $cas_server_dns;
     proxy_pass {{ 'https' if vitamui.cas_server.secure | default(secure) | bool else 'http' }}://$cas_server_dns:{{ vitamui.cas_server.port_service }};
 
     #proxy_pass {{ 'https' if vitamui.cas_server.secure | default(secure) | bool else 'http' }}://CAS; # error: upstream SSL certificate does not match "CAS" while SSL handshaking to upstream

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

@@ -63,8 +63,8 @@ vitamui.cas.identity: cas
 iam-client:
   server-host: {{ vitamui.iam.host }}
   server-port: {{ vitamui.iam.port_service }}
-{% if vitamui.iam.secure | default(secure) | bool == true %}
-  secure: {{ vitamui.iam.secure | default(secure) | lower }}
+{% if vitamui.iam.secure | default(secure) | bool %}
+  secure: true
   ssl-configuration:
     keystore:
       key-path: {{ vitamui_folder_conf }}/keystore_client_{{ vitamui_struct.vitamui_component }}.jks