Merge branch 'main' into feature/fix-deployment

Author: baszoetekouw

environments/template/group_vars/template.yml

@@ -1,7 +1,6 @@
 ---
 
 env: "%env%"
-show_debug_info: false # Show extra debug info
 mariadb_host: localhost
 rsyslog_host: localhost
 database_clients: [ "{{ mariadb_host }}" ]
@@ -212,7 +211,7 @@ aa:
   sab_username: coin-test
   sab_rest_username: surfconexttest
   sab_rest_password: "{{ aa_sab_rest_password }}"
-  sab_rest_endpoint: https://sab.acc.surfaccess.nl
+  sab_rest_endpoint: https://sab.acc.surfaccess.nl/api/profile
   surfmarket_url: https://example.org
   surfmarket_username: example@example.org
   surfmarket_password: "{{ aa_surfmarket_password }}"

roles/invite/templates/serverapplication.yml.j2

@@ -132,8 +132,8 @@ config:
 
 
 feature:
-  limit-institution-admin-role-visibility: {{ invite.limit_institution_admin_role_visibility }}
   enable-performance-seed: False
+  allow-for-eduid-only-enforcement-for-non-guests: False
 
 # We don't encode in-memory passwords, but they are reused so do NOT prefix them with {noop}
 external-api-configuration:
@@ -202,7 +202,9 @@ manage:
 springdoc:
   pathsToMatch:
     - "/api/external/v1/**"
-    - "/api/internal/v1/crm"
+    - "/crm/profile"
+    - "/api/profile"
+    - "/crm/api/v1/**"
   api-docs:
     path: "/ui/api-docs"
   swagger-ui:

roles/manage/templates/application.yml.j2

@@ -64,7 +64,7 @@ product:
 metadata_configuration_path: file://{{ manage_dir }}/metadata_configuration
 metadata_templates_path: file://{{ manage_dir }}/metadata_templates
 metadata_export_path: classpath:/metadata_export
-disabled_metadata_schemas: []
+disabled_metadata_schemas: "organisation.schema.json"
 
 security:
   backdoor_user_name: {{ manage.backdoor_api_user }}

roles/mongo/tasks/clusterconfig.yml

@@ -8,23 +8,19 @@
   check_mode: false
 
 - name: Debug check_cluster variable
-  when: show_debug_info is defined and show_debug_info | bool
   ansible.builtin.debug:
     msg: "{{ check_cluster }}"
+    verbosity: 2
 
 - name: Debug mongo_cluster_members variable
-  when: show_debug_info is defined and show_debug_info | bool
   ansible.builtin.debug:
     msg: "{{ mongo_cluster_members }}"
+    verbosity: 2
 
 - name: Debug mongo_replication_role variable
-  when: show_debug_info is defined and show_debug_info | bool
   ansible.builtin.debug:
     msg: "{{ mongo_replication_role }}"
-
-- name: Debug host_id
-  ansible.builtin.debug:
-    msg: "{{ hostid }}"
+    verbosity: 2
 
 - name: Initial cluster initialisation
   community.mongodb.mongodb_replicaset:

roles/mongo/tasks/main.yml

@@ -17,9 +17,9 @@
       ansible.builtin.include_tasks:
         file: certs.yml
 
-    - name: Include cluster installation tasks
-      ansible.builtin.include_tasks:
-        file: clusterconfig.yml
+    # - name: Include cluster installation tasks
+    #   ansible.builtin.include_tasks:
+    #     file: clusterconfig.yml
 
     - name: Include user creation
       ansible.builtin.include_tasks:

roles/oidcng/templates/application.yml.j2

@@ -3,7 +3,6 @@ logging:
   config: file://{{ oidcng_config_dir }}/logback.xml
   level:
     org.springframework: WARN
-    oidc: INFO
 
 # Is this node in a load-balanced topology responsible for cleaning up resources
 cron:

roles/spdashboard/templates/env.j2

@@ -54,13 +54,24 @@ playground_uri_prod={{ spdashboard_playground_uri_prod }}
 global_site_notice_show={{ spdashboard_show_global_notice }}
 global_site_notice_date={{ spdashboard_global_notice_date }}
 global_site_notice_allowed_tags=<a><u><i><br><wbr><strong><em><blink><marquee><p><ul><ol><dl><li><dd><dt><div><span><blockquote><hr><h2></h2><h3><h4><h5><h6>
-teams_host={{ spdashboard_teams_host }}
-teams_username={{ spdashboard_teams_api_user }}
-teams_password={{ spdashboard_teams_api_password }}
-team_prefix_default_stem_name={{ spdashboard_teams_default_stem }}
-team_prefix_group_name_context={{ spdashboard_teams_group_name_context }}
+
 acs_location_route_name=dashboard_saml_consume_assertion
 metadata_url_timeout=30
 test_idp_entity_ids=[{{ spdashboard_test_idps }}]
 authorization_attribute_name={{ spdashboard_surf_autorization_attribute }}
 surfconext_representative_authorization={{ spdashboard_surf_autorization_attribute_svc_value }}
+
+## Teams test instance
+teams_host={{ spdashboard_teams_host }}
+teams_username={{ spdashboard_teams_api_user }}
+teams_password={{ spdashboard_teams_api_password }}
+team_prefix_default_stem_name={{ spdashboard_teams_default_stem }}
+team_prefix_group_name_context={{ spdashboard_teams_group_name_context }}
+
+spdashboard_manage_id={{ spdashboard_manage_id }}
+
+## Invite instance
+invite_host={{ spdashboard_invite_host }}
+invite_api_username={{ spdashboard_invite_api_username }}
+invite_api_password={{ spdashboard_invite_api_password }}
+invite_landing_url={{ spdashboard_invite_landing_url }}}