From b71248520c4163d2de959556a538142bdd0fe2a8 Mon Sep 17 00:00:00 2001 From: Bas Zoetekouw Date: Mon, 30 Mar 2026 17:15:30 +0200 Subject: [PATCH 1/2] Simplify and consolidate disabling tabs/schemas in Manage # Conflicts: # roles/manage/defaults/main.yml --- roles/manage/defaults/main.yml | 3 ++- roles/manage/templates/application.yml.j2 | 3 ++- roles/manage/vars/main.yml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 roles/manage/vars/main.yml diff --git a/roles/manage/defaults/main.yml b/roles/manage/defaults/main.yml index 1f616ebe9..e2993d912 100644 --- a/roles/manage/defaults/main.yml +++ b/roles/manage/defaults/main.yml @@ -22,7 +22,7 @@ manage_manage_provision_samlsp_trusted_proxy: false manage_manage_provision_samlsp_sign: false manage_provision_push: false manage_super_user_attribute_name: is-member-of -manage_tabs_enabled: +manage_tabs_available: - saml20_idp - saml20_sp - oidc10_rp @@ -34,6 +34,7 @@ manage_tabs_enabled: - organisation - sfo - institution +manage_tabs_disabled: [] manage_docker_networks: - name: loadbalancer manage_server_restart_policy: always diff --git a/roles/manage/templates/application.yml.j2 b/roles/manage/templates/application.yml.j2 index 31085a6d7..bcea2ffeb 100644 --- a/roles/manage/templates/application.yml.j2 +++ b/roles/manage/templates/application.yml.j2 @@ -73,7 +73,8 @@ 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: [] +# comma-separated list of schema jason files that are not in use; calculate from manage_tabs_disabled. +disabled_metadata_schemas: "{{ manage_tabs_disabled | map('regex_replace', '$', '.schema.json') | join(',') }}" security: backdoor_user_name: {{ manage.backdoor_api_user }} diff --git a/roles/manage/vars/main.yml b/roles/manage/vars/main.yml new file mode 100644 index 000000000..ba1cd6b43 --- /dev/null +++ b/roles/manage/vars/main.yml @@ -0,0 +1,2 @@ +--- +manage_tabs_enabled: "{{ manage_tabs_available | reject('in', manage_tabs_disabled) | list }}" From d599645bb61c5603a362b86de7701bcbfdfb5cb5 Mon Sep 17 00:00:00 2001 From: Bas Zoetekouw Date: Mon, 30 Mar 2026 17:57:13 +0200 Subject: [PATCH 2/2] add missing keys too application.yml --- roles/manage/defaults/main.yml | 2 ++ roles/manage/templates/application.yml.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/roles/manage/defaults/main.yml b/roles/manage/defaults/main.yml index e2993d912..1f2ce8156 100644 --- a/roles/manage/defaults/main.yml +++ b/roles/manage/defaults/main.yml @@ -12,6 +12,8 @@ manage_exclude_sram_imports_in_push: true manage_show_oidc_rp_tab: false manage_exclude_oidc_rp_imports_in_push: false manage_metadata_refresh_cron_schedule: "-" +manage_jira_ticket_prefixes: "" +manage_jira_base_url: "https://jira.example.org/" manage_manage_provision_samlsp_client_id: "https://manage.{{ base_domain }}/shibboleth" manage_manage_provision_samlsp_name_en: "{{ instance_name }} Manage" manage_manage_provision_samlsp_description_en: "{{ instance_name }} Manage" diff --git a/roles/manage/templates/application.yml.j2 b/roles/manage/templates/application.yml.j2 index bcea2ffeb..d3684af83 100644 --- a/roles/manage/templates/application.yml.j2 +++ b/roles/manage/templates/application.yml.j2 @@ -69,6 +69,8 @@ product: jira_ticket_prefixes: CXT,SD supported_languages: {{ supported_language_codes }} show_oidc_rp: {{ manage_show_oidc_rp_tab }} + jira_ticket_prefixes: "{{ manage_jira_ticket_prefixes }}" + jira_base_url: "{{ manage_jira_base_url }}" metadata_configuration_path: file://{{ manage_dir }}/metadata_configuration metadata_templates_path: file://{{ manage_dir }}/metadata_templates