14 Commits

Author SHA1 Message Date
renovate[bot]
7a1cf643bc chore(deps): update dependency etherpad to v2.6.1-5 2026-04-01 20:34:50 +03:00
renovate[bot]
ae6aa35028 chore(deps): update pre-commit hook ansible/ansible-lint to v26.4.0 2026-04-01 20:34:42 +03:00
renovate[bot]
361939f17d chore(deps): update docker.io/metio/matrix-alertmanager-receiver docker tag to v2026.4.1 2026-04-01 15:41:23 +03:00
renovate[bot]
cf0332aa09 chore(deps): update dependency etherpad to v2.6.1-4 2026-04-01 09:01:36 +03:00
renovate[bot]
8145a6e492 chore(deps): update dependency sable to v1.13.1-0 2026-03-31 18:23:40 +03:00
renovate[bot]
3a120f5c25 chore(deps): update ghcr.io/element-hq/lk-jwt-service docker tag to v0.4.2 2026-03-31 18:23:20 +03:00
renovate[bot]
539136dce6 chore(deps): update dependency ntfy to v2.21.0-0 2026-03-31 08:49:16 +03:00
Slavi Pantaleev
94a0a6c6ec fix(mas): keep Synapse stopped after syn2mas migration
Avoid reopening a transition window where Synapse can accept new registrations or other auth changes
after syn2mas completes but before the MAS cutover is finalized.

Inspired by and continuing the work done in: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/5097
2026-03-31 08:49:03 +03:00
renovate[bot]
060db8f428 chore(deps): update dependency jitsi to v10888 2026-03-31 01:39:18 +03:00
Jean-Benoît Grimaldi
e5804c4203 fix(mas): Don't fail if OpenID connect is setup in synapse while upgrading to MAS 2026-03-30 20:54:51 +03:00
renovate[bot]
8a3adae240 chore(deps): update dependency livekit_server to v1.10.1-0 2026-03-30 20:45:44 +03:00
renovate[bot]
c897c8f5de chore(deps): update dependency pygments to v2.20.0 2026-03-29 21:05:18 +03:00
anya hope
720a1b1a31 feat(c10y): add url_preview_check_root_domain 2026-03-29 09:59:54 +03:00
anya hope
3f0326855d feat(c10y): add url_preview_domain_explicit_allowlist 2026-03-29 09:59:54 +03:00
11 changed files with 31 additions and 17 deletions

View File

@@ -24,7 +24,7 @@ repos:
hooks: hooks:
- id: reuse - id: reuse
- repo: https://github.com/ansible/ansible-lint - repo: https://github.com/ansible/ansible-lint
rev: v26.3.0 rev: v26.4.0
hooks: hooks:
- id: ansible-lint - id: ansible-lint
files: '^roles/custom/' files: '^roles/custom/'

View File

@@ -398,6 +398,8 @@ To perform a real migration, run the `matrix-authentication-service-mas-cli-syn2
just run-tags matrix-authentication-service-mas-cli-syn2mas just run-tags matrix-authentication-service-mas-cli-syn2mas
``` ```
After `syn2mas` completes, Synapse will intentionally remain stopped to avoid new registrations or other authentication changes from being accepted before the migration is completed. Continue with the next steps in this guide before re-running the installation.
Having performed a `syn2mas` migration once, trying to do it again will report errors (e.g. "Error: The MAS database is not empty: rows found in at least `users`. Please drop and recreate the database, then try again."). Having performed a `syn2mas` migration once, trying to do it again will report errors (e.g. "Error: The MAS database is not empty: rows found in at least `users`. Please drop and recreate the database, then try again.").
## Verify that Matrix Authentication Service is installed correctly ## Verify that Matrix Authentication Service is installed correctly

View File

@@ -14,7 +14,7 @@ mdit-py-plugins==0.5.0
mdurl==0.1.2 mdurl==0.1.2
myst-parser==5.0.0 myst-parser==5.0.0
packaging==26.0 packaging==26.0
Pygments==2.19.2 Pygments==2.20.0
PyYAML==6.0.3 PyYAML==6.0.3
requests==2.33.0 requests==2.33.0
setuptools==82.0.1 setuptools==82.0.1

View File

@@ -27,7 +27,7 @@
version: 542a2d68db4e9a8e9bb4b508052760b900c7dce6 version: 542a2d68db4e9a8e9bb4b508052760b900c7dce6
name: docker_sdk_for_python name: docker_sdk_for_python
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-etherpad.git - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-etherpad.git
version: v2.6.1-3 version: v2.6.1-5
name: etherpad name: etherpad
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-exim-relay.git - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-exim-relay.git
version: v4.99.1-r0-2-0 version: v4.99.1-r0-2-0
@@ -39,13 +39,13 @@
version: v0.5.1-2 version: v0.5.1-2
name: hydrogen name: hydrogen
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git
version: v10741-2 version: v10888-0
name: jitsi name: jitsi
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-livekit-server.git - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-livekit-server.git
version: v1.9.12-1 version: v1.10.1-0
name: livekit_server name: livekit_server
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-ntfy.git - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-ntfy.git
version: v2.20.1-0 version: v2.21.0-0
name: ntfy name: ntfy
- src: git+https://github.com/devture/com.devture.ansible.role.playbook_help.git - src: git+https://github.com/devture/com.devture.ansible.role.playbook_help.git
version: ea8c5cc750c4e23d004c9a836dfd9eda82d45ff4 version: ea8c5cc750c4e23d004c9a836dfd9eda82d45ff4
@@ -75,7 +75,7 @@
version: v0.19.1-3 version: v0.19.1-3
name: prometheus_postgres_exporter name: prometheus_postgres_exporter
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-sable.git - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-sable.git
version: v1.6.0-3 version: v1.13.1-0
name: sable name: sable
- src: git+https://github.com/devture/com.devture.ansible.role.systemd_docker_base.git - src: git+https://github.com/devture/com.devture.ansible.role.systemd_docker_base.git
version: v1.5.0-0 version: v1.5.0-0

View File

@@ -11,7 +11,7 @@
matrix_alertmanager_receiver_enabled: true matrix_alertmanager_receiver_enabled: true
# renovate: datasource=docker depName=docker.io/metio/matrix-alertmanager-receiver # renovate: datasource=docker depName=docker.io/metio/matrix-alertmanager-receiver
matrix_alertmanager_receiver_version: 2026.3.25 matrix_alertmanager_receiver_version: 2026.4.1
matrix_alertmanager_receiver_scheme: https matrix_alertmanager_receiver_scheme: https

View File

@@ -110,11 +110,17 @@
ansible.builtin.debug: ansible.builtin.debug:
var: matrix_authentication_service_mas_cli_syn2mas_command_result var: matrix_authentication_service_mas_cli_syn2mas_command_result
- name: Ensure Synapse is started (if it previously was) - name: Inject syn2mas post-migration note
when: "not matrix_authentication_service_syn2mas_migrate_dry_run and matrix_authentication_service_mas_cli_syn2mas_command_result.changed" when: "not matrix_authentication_service_syn2mas_migrate_dry_run and matrix_authentication_service_mas_cli_syn2mas_command_result.changed"
ansible.builtin.service: ansible.builtin.set_fact:
name: matrix-synapse devture_playbook_runtime_messages_list: |
state: started {{
devture_playbook_runtime_messages_list | default([])
+
[
"Synapse was intentionally not restarted after `syn2mas`. Continue with the next steps in the Matrix Authentication Service migration guide before re-running the installation."
]
}}
- name: Ensure Matrix Authentication Service is started (if it previously was) - name: Ensure Matrix Authentication Service is started (if it previously was)
when: "not matrix_authentication_service_syn2mas_migrate_dry_run and matrix_authentication_service_mas_ensure_stopped_result.changed" when: "not matrix_authentication_service_syn2mas_migrate_dry_run and matrix_authentication_service_mas_ensure_stopped_result.changed"

View File

@@ -199,6 +199,12 @@ matrix_continuwuity_config_ignore_messages_from_server_names: []
# Controls the `url_preview_domain_contains_allowlist` setting. # Controls the `url_preview_domain_contains_allowlist` setting.
matrix_continuwuity_config_url_preview_domain_contains_allowlist: [] matrix_continuwuity_config_url_preview_domain_contains_allowlist: []
# Controls the `url_preview_domain_explicit_allowlist` setting.
matrix_continuwuity_config_url_preview_domain_explicit_allowlist: []
# Controls the `url_preview_check_root_domain` setting.
matrix_continuwuity_config_url_preview_check_root_domain: false
# Additional environment variables to pass to the container. # Additional environment variables to pass to the container.
# #
# Environment variables take priority over settings in the configuration file. # Environment variables take priority over settings in the configuration file.

View File

@@ -1319,7 +1319,7 @@ url_preview_domain_contains_allowlist = {{ matrix_continuwuity_config_url_previe
# attack surface to your server, you are expected to be aware of the risks # attack surface to your server, you are expected to be aware of the risks
# by doing so. # by doing so.
# #
#url_preview_domain_explicit_allowlist = [] url_preview_domain_explicit_allowlist = {{ matrix_continuwuity_config_url_preview_domain_explicit_allowlist | to_json }}
# Vector list of explicit domains not allowed to send requests to for URL # Vector list of explicit domains not allowed to send requests to for URL
# previews. # previews.
@@ -1359,7 +1359,7 @@ url_preview_domain_contains_allowlist = {{ matrix_continuwuity_config_url_previe
# allowlist is still too broad for you but you still want to allow all the # allowlist is still too broad for you but you still want to allow all the
# subdomains under a root domain. # subdomains under a root domain.
# #
#url_preview_check_root_domain = false url_preview_check_root_domain = {{ matrix_continuwuity_config_url_preview_check_root_domain | to_json }}
# List of forbidden room aliases and room IDs as strings of regex # List of forbidden room aliases and room IDs as strings of regex
# patterns. # patterns.

View File

@@ -25,7 +25,7 @@ matrix_livekit_jwt_service_container_additional_networks_auto: []
matrix_livekit_jwt_service_container_additional_networks_custom: [] matrix_livekit_jwt_service_container_additional_networks_custom: []
# renovate: datasource=docker depName=ghcr.io/element-hq/lk-jwt-service # renovate: datasource=docker depName=ghcr.io/element-hq/lk-jwt-service
matrix_livekit_jwt_service_version: 0.4.1 matrix_livekit_jwt_service_version: 0.4.2
matrix_livekit_jwt_service_container_image_self_build: false matrix_livekit_jwt_service_container_image_self_build: false
matrix_livekit_jwt_service_container_repo: "https://github.com/element-hq/lk-jwt-service.git" matrix_livekit_jwt_service_container_repo: "https://github.com/element-hq/lk-jwt-service.git"

View File

@@ -210,7 +210,7 @@
- name: Fail if OpenID Connect is enabled for Synapse when auth is delegated to Matrix Authentication Service - name: Fail if OpenID Connect is enabled for Synapse when auth is delegated to Matrix Authentication Service
ansible.builtin.fail: ansible.builtin.fail:
msg: "When Synapse is delegating authentication to Matrix Authentication Service (`matrix_synapse_matrix_authentication_service_enabled: true`), it doesn't make sense to enable OpenID Connect (`matrix_synapse_oidc_enabled: true`), because it is not Synapse that is handling authentication. Synapse will refuse to start otherwise." msg: "When Synapse is delegating authentication to Matrix Authentication Service (`matrix_synapse_matrix_authentication_service_enabled: true`), it doesn't make sense to enable OpenID Connect (`matrix_synapse_oidc_enabled: true`), because it is not Synapse that is handling authentication. Synapse will refuse to start otherwise."
when: matrix_synapse_matrix_authentication_service_enabled and matrix_synapse_oidc_enabled when: matrix_synapse_matrix_authentication_service_enabled and matrix_synapse_oidc_enabled and not matrix_authentication_service_migration_in_progress
- name: Fail if CAS config is enabled for Synapse when auth is delegated to Matrix Authentication Service - name: Fail if CAS config is enabled for Synapse when auth is delegated to Matrix Authentication Service
ansible.builtin.fail: ansible.builtin.fail:

View File

@@ -2987,7 +2987,7 @@ background_updates:
#default_batch_size: 50 #default_batch_size: 50
{% if matrix_synapse_matrix_authentication_service_enabled %} {% if matrix_synapse_matrix_authentication_service_enabled and not matrix_authentication_service_migration_in_progress %}
matrix_authentication_service: matrix_authentication_service:
enabled: true enabled: true
endpoint: {{ matrix_synapse_matrix_authentication_service_endpoint | to_json }} endpoint: {{ matrix_synapse_matrix_authentication_service_endpoint | to_json }}