Merge branch 'main' into feature/open-access

Author: baszoetekouw

.editorconfig

@@ -9,6 +9,7 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = 2
+max_line_length = 180
 
 [*.py]
 indent_size = 4

.gitignore

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

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 }}" ]
@@ -43,8 +42,7 @@ teams_gui_version: "9.1.3"
 teams_server_version: "9.1.3"
 voot_version: "6.2.0"
 myconext_version: "8.1.12-1"
-dashboard_server_version: "12.3.4"
-dashboard_gui_version: "12.3.4"
+dashboard_version: "13.0.11"
 invite_server_version: "0.0.2-SNAPSHOT"
 invite_client_version: "0.0.2-SNAPSHOT"
 invite_welcome_version: "0.0.2-SNAPSHOT"

environments/template/secrets/secret_example.yml

@@ -32,7 +32,7 @@ myconext_verify_client_id: secret
 myconext_verify_secret: secret
 engine_api_profile_password: secret
 engine_api_deprovision_password: secret
-engine_parameters_secret: secret
+engine_parameters_secret: secretsecretsecretsecretsecretsecret  # need 32 chars
 
 profile_secret: secret
 

provision.yml

@@ -140,7 +140,7 @@
   hosts: docker_engineblock
   become: true
   roles:
-    - engineblock
+    - engine
   tags: ['engineblock', 'eb']
 
 - name: Deploy invite app

roles/dashboard/tasks/main.yml

@@ -25,7 +25,7 @@
     name: dashboardserver
     env:
       TZ: "{{ timezone }}"
-    image: ghcr.io/openconext/openconext-dashboard/dashboard-server:{{ dashboard_server_version }}
+    image: ghcr.io/openconext/openconext-dashboard/dashboard-server:{{ dashboard_version }}
     pull: true
     restart_policy: "{{ dashboard_server_restart_policy }}"
     restart_retries: "{{ dashboard_server_restart_retries }}" # Only for restart policy on-failure
@@ -61,7 +61,7 @@
 - name: Create the gui container
   community.docker.docker_container:
     name: dashboardgui
-    image: ghcr.io/openconext/openconext-dashboard/dashboard-gui:{{ dashboard_gui_version }}
+    image: ghcr.io/openconext/openconext-dashboard/dashboard-gui:{{ dashboard_version }}
     pull: true
     restart_policy: "always"
     state: started

roles/engineblock/defaults/main.yml roles/engine/defaults/main.ymlroles/engineblock/defaults/main.yml renamed to roles/engine/defaults/main.yml

@@ -22,22 +22,8 @@ engine_feature_send_user_attributes: 0
 engine_wayf_cutoff_point_for_showing_unfiltered_idps: 50
 engine_wayf_show_remember_choice: false
 
-## Engine installer specific variables.
-engine_version_dir: "{{ engine_version | replace('/', '-') }}"
-engine_branch_dir: "{{ openconext_builds_dir }}/OpenConext-engineblock-{{ engine_branch | replace('/', '-') }}"
-engine_release_dir: "{{ openconext_releases_dir }}/OpenConext-engineblock-{{ engine_version_dir }}"
-engine_build_path: "{{ openconext_builds_dir }}/OpenConext-engineblock-{{ engine_version_dir }}.tar.gz"
-engine_download_url: "https://github.com/OpenConext/OpenConext-engineblock/releases/download/{{ engine_version }}/OpenConext-engineblock-{{ engine_version_dir }}.tar.gz"
-engine_current_release_symlink: "{{ openconext_releases_dir }}/OpenConext-engineblock"
-
-engine_ipv4_address: "*"
-# engine_ipv6_address:
-engine_api_ipv4_address: "*"
-# engine_api_ipv6_address:
-
 # Required for the Symfony routing.
 engine_base_domain: "{{ base_domain }}"
-
 engine_domain: engine.{{ base_domain }}
 
 engine_debug: false
@@ -89,8 +75,6 @@ engine_stepup_gateway_loa3: "http://{{ engine_stepup_base_domain }}/assurance/lo
 engine_stepup_gateway_sfo_entity_id: "https://{{ engine_stepup_gateway_domain }}/second-factor-only/metadata"
 # The single sign-on endpoint used for Stepup Gateway SFO callouts
 engine_stepup_gateway_sfo_sso_location: "https://{{ engine_stepup_gateway_domain }}/second-factor-only/single-sign-on"
-# The public key from the Stepup Gateway IdP
-engine_stepup_gateway_sfo_public_key_file: "{{ engine_keys.default.publicFile }}"
 
 ## The minimum priority of messages that will be logged
 engine_logging_passthru_level: NOTICE
@@ -104,13 +88,12 @@ engine_idp_debugging_to_name: "{{ instance_name }} Admin"
 engine_idp_debugging_email_address: "{{ support_email }}"
 engine_idp_debugging_subject: "IdP debug info from %1$s"
 
-eb_support_url: "https://example.org"
-eb_support_url_nameid: "https://example.org"
-eb_tos_url: "https://example.org"
+engine_support_url: "https://example.org"
+engine_support_url_nameid: "https://example.org"
 
 engine_site_notice_show: false
 
-engineblock_log_attributes: []
+engine_log_attributes: []
 
 engine_php_memory: 256M
 engine_docker_networks:

roles/engineblock/handlers/main.yml roles/engine/handlers/main.ymlroles/engineblock/handlers/main.yml renamed to roles/engine/handlers/main.yml

@@ -1,10 +1,10 @@
 ---
-- name: restart engine
+- name: Restart engine
   community.docker.docker_container:
     name: engineblock
     state: started
     restart: true
     # avoid restarting it creates unexpected data loss according to docker_container_module notes
     comparisons:
       '*': ignore
-  when: ebcontainer is success and ebcontainer is not change
+  when: engine_container is success and engine_container is not change