Merge remote-tracking branch 'origin/main' into release/620

Author: baszoetekouw

.gitignore

@@ -2,6 +2,7 @@
 secrets_test.yml
 .vagrant
 .idea/
+
 .DS_Store
 delme
 

roles/invite/templates/serverapplication.yml.j2

@@ -74,7 +74,6 @@ crypto:
   private-key-location: file:///private_key_pkcs8.pem
 
 cron:
-  node-cron-job-responsible: {{ invite_cronjobmaster }}
   user-cleaner-expression: "0 0/30 * * * *"
   last-activity-duration-days: 1000
   role-expiration-notifier-expression: "0 0/30 * * * *"
@@ -83,6 +82,8 @@ cron:
   metadata-resolver-initial-delay-milliseconds: 1
   metadata-resolver-fixed-rate-milliseconds: 86_400_000
   metadata-resolver-url: "https://metadata.{{ base_domain }}/idps-metadata.xml"
+  # A value of 0 means no logs will be deleted
+  purge-audit-log-days: 365
 
 myconext:
   uri: "https://login.{{ myconext_base_domain }}/myconext/api/invite/provision-eduid"

roles/manage/defaults/main.yml

@@ -32,8 +32,6 @@ manage_tabs_enabled:
   - provisioning
   - sram
   - organisation
-  - sfo
-  - institution
 manage_docker_networks:
   - name: loadbalancer
 manage_server_restart_policy: always

roles/manage/files/metadata_templates/institution.template.json

@@ -11,15 +11,6 @@
     - "/opt/openconext/manage/metadata_templates"
     - "/opt/openconext/manage/policies"
 
-- name: Copy Stepup stepup_config.json from inventory
-  ansible.builtin.copy:
-    src: "{{ inventory_dir }}/files/manage/stepup_config.json"
-    dest: "/opt/openconext/manage/stepup_config.json"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  notify: restart manageserver
-
 - name: Import the mongo CA file
   ansible.builtin.copy:
     src: "{{ inventory_dir }}/secrets/mongo/mongoca.pem"
@@ -123,10 +114,6 @@
       - source: /opt/openconext/manage/__cacert_entrypoint.sh
         target: /__cacert_entrypoint.sh
         type: bind
-      - source: /opt/openconext/manage/stepup_config.json
-        target: /stepup_config.json
-        type: bind
-
     command: "java -jar /app.jar -Xmx512m --spring.config.location=./config/"
     etc_hosts:
       host.docker.internal: host-gateway

roles/manage/files/metadata_templates/sfo.template.json

@@ -53,20 +53,11 @@ push:
     user: {{ pdp.username }}
     password: "{{ pdp.password }}"
     enabled: {{ manage.pdp_push_enabled }}
-  stepup:
-    url: https://middleware.{{ base_domain }}
-    user: {{ manage.middleware_user }}
-    configuration_file: "file:///stepup_config.json"
-    password: {{ manage_middleware_password }}
-    enabled:  {{ manage.stepup_push_enabled }}
-
 
 product:
   name: Manage
   organization: {{ instance_name }}
   service_provider_feed_url: {{ manage_service_provider_feed_url }}
-  jira_base_url: https://servicedesk.surf.nl/jira/browse/
-  jira_ticket_prefixes: CXT,SD
   supported_languages: {{ supported_language_codes }}
   show_oidc_rp: {{ manage_show_oidc_rp_tab }}