Merge branch 'master' into element-call-integration

roles/custom/matrix-client-element/defaults/main.yml

@@ -1,3 +1,21 @@
+# SPDX-FileCopyrightText: 2020 - 2022 Aaron Raimist
+# SPDX-FileCopyrightText: 2020 - 2024 MDAD project contributors
+# SPDX-FileCopyrightText: 2020 - 2025 Slavi Pantaleev
+# SPDX-FileCopyrightText: 2020 Dan Arnfield
+# SPDX-FileCopyrightText: 2021 Ahmad Haghighi
+# SPDX-FileCopyrightText: 2021 Paul Tötterman
+# SPDX-FileCopyrightText: 2022 - 2023 Julian-Samuel Gebühr
+# SPDX-FileCopyrightText: 2022 - 2025 Nikita Chernyi
+# SPDX-FileCopyrightText: 2022 Christos Karamolegkos
+# SPDX-FileCopyrightText: 2022 Joe Kappus
+# SPDX-FileCopyrightText: 2022 Marko Weltzer
+# SPDX-FileCopyrightText: 2023 Igor Goldenberg
+# SPDX-FileCopyrightText: 2023 Pierre 'McFly' Marty
+# SPDX-FileCopyrightText: 2023 Samuel Meenzen
+# SPDX-FileCopyrightText: 2024 Suguru Hirahara
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
 ---
 # Project source code URL: https://github.com/element-hq/element-web
 
@@ -10,11 +28,13 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme
 # - https://github.com/element-hq/element-web/issues/19544
 matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}"
 
-# renovate: datasource=docker depName=vectorim/element-web
-matrix_client_element_version: v1.11.86
+# renovate: datasource=docker depName=ghcr.io/element-hq/element-web
+matrix_client_element_version: v1.11.95
 
-matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
-matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"
+matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_registry_prefix }}element-hq/element-web:{{ matrix_client_element_version }}"
+matrix_client_element_docker_image_registry_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_client_element_docker_image_registry_prefix_upstream }}"
+matrix_client_element_docker_image_registry_prefix_upstream: "{{ matrix_client_element_docker_image_registry_prefix_upstream_default }}"
+matrix_client_element_docker_image_registry_prefix_upstream_default: ghcr.io/
 matrix_client_element_docker_image_force_pull: "{{ matrix_client_element_docker_image.endswith(':latest') }}"
 
 matrix_client_element_data_path: "{{ matrix_base_data_path }}/client-element"
@@ -28,9 +48,16 @@ matrix_client_element_container_network: ''
 # Use this to expose this container to a reverse proxy, which runs in a different container network.
 matrix_client_element_container_additional_networks: []
 
+# Controls the in-container port that Element will use.
+#
+# Also see: `matrix_client_element_container_http_host_bind_port`
+matrix_client_element_container_port: 8080
+
 # Controls whether the matrix-client-element container exposes its HTTP port (tcp/8080 in the container).
 #
 # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8765"), or empty string to not expose.
+#
+# Also see: `matrix_client_element_container_port`
 matrix_client_element_container_http_host_bind_port: ''
 
 # matrix_client_element_container_labels_traefik_enabled controls whether labels to assist a Traefik reverse-proxy will be attached to the container.
@@ -83,6 +110,14 @@ matrix_client_element_container_extra_arguments: []
 # List of systemd services that matrix-client-element.service depends on
 matrix_client_element_systemd_required_services_list: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
 
+# Controls the healthcheck command for the container.
+#
+# Leave empty to use the default (upstream) command.
+#
+# The default command is a patch until https://github.com/element-hq/element-web/pull/29471
+# lands in a release.
+matrix_client_element_container_healthcheck_cmd: "wget -q --spider http://localhost:$ELEMENT_WEB_PORT/config.json"
+
 # Specifies the value of the `X-XSS-Protection` header
 # Stops pages from loading when they detect reflected cross-site scripting (XSS) attacks.
 #
@@ -255,7 +290,7 @@ matrix_client_element_self_check_validate_certificates: true
 # don't show the registration button on welcome page
 matrix_client_element_registration_enabled: false
 
-# Default country code on welcome page when login by phone number
+# An optional ISO 3166 alpha2 country code (eg: GB, the default) to use when showing phone number inputs
 matrix_client_element_default_country_code: "GB"
 
 # Controls whether presence will be enabled
@@ -379,3 +414,19 @@ matrix_client_element_location_sharing_map_style_content_sources_localsource_til
 # matrix_client_element_location_sharing_map_style_content_sources_localsource_attribution: "&copy; <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a> contributors"
 # Leave blank, if map does not require attribution.
 matrix_client_element_location_sharing_map_style_content_sources_localsource_attribution: ""
+
+# Optional URL to redirect the user to after they have logged out.
+# See https://github.com/element-hq/element-web/blob/develop/docs/config.md#sso-setup
+matrix_client_element_logout_redirect_url: ''
+
+# Controls the `ELEMENT_WEB_PORT` environment variable.
+matrix_client_element_environment_variable_element_web_port: "{{ matrix_client_element_container_port }}"
+
+# Additional environment variables to pass to the container.
+#
+# Environment variables take priority over settings in the configuration file.
+#
+# Example:
+# matrix_client_element_environment_variables_extension: |
+#   ELEMENT_WEB_PORT=8080
+matrix_client_element_environment_variables_extension: ''