Merge branch 'master' into element-call-integration

examples/hosts

@@ -2,7 +2,7 @@
 # If you'd rather use a local IP here, make sure to set up `matrix_coturn_turn_external_ip_address`.
 #
 # To connect using a non-root user (and elevate to root with sudo later),
-# replace `ansible_ssh_user=root` with something like this: `ansible_ssh_user=username become=true become_user=root`.
+# replace `ansible_ssh_user=root` with something like this: `ansible_ssh_user=username ansible_become=true ansible_become_user=root`.
 # If sudo requires a password, either add `become_password=PASSWORD_HERE` to the host line
 # or tell Ansible to ask you for the password interactively by adding a `--ask-become-pass` (`-K`) flag to all `ansible-playbook` (or `just`) commands.
 #

examples/hosts.license

@@ -1,4 +1,4 @@
-SPDX-FileCopyrightText: 2017 - 2024 Slavi Pantaleev
+SPDX-FileCopyrightText: 2017 - 2025 Slavi Pantaleev
 SPDX-FileCopyrightText: 2019 Dan Arnfield
 SPDX-FileCopyrightText: 2019 MDAD project contributors
 SPDX-FileCopyrightText: 2021 Aaron Raimist

roles/custom/matrix-synapse/defaults/main.yml

@@ -570,6 +570,10 @@ matrix_synapse_registration_requires_token: false
 # A list of 3PID types which users must supply when registering (possible values: email, msisdn).
 matrix_synapse_registrations_require_3pid: []
 
+# Explicitly disable asking for MSISDNs from the registration
+# flow (overrides matrix_synapse_registrations_require_3pid if MSISDNs are set as required)
+matrix_synapse_disable_msisdn_registration: false
+
 # A list of patterns 3pids must match in order to permit registration, e.g.:
 #  - medium: email
 #    pattern: '.*@example\.com'
@@ -1206,6 +1210,27 @@ matrix_synapse_email_invite_client_location: "https://app.element.io"
 #
 ################################################################################
 
+# Controls whether to enable the "send typing, presence and receipts to appservices" experimental feature.
+#
+# See:
+# - https://github.com/matrix-org/matrix-spec-proposals/pull/2409
+# - https://matrix-org.github.io/matrix-hookshot/latest/advanced/encryption.html#running-with-synapse
+matrix_synapse_experimental_features_msc2409_to_device_messages_enabled: false
+
+# Controls whether to enable the "device masquerading" for encrypted appservices experimental feature.
+#
+# See:
+# - https://github.com/matrix-org/matrix-spec-proposals/pull/3202
+# - https://matrix-org.github.io/matrix-hookshot/latest/advanced/encryption.html#running-with-synapse
+matrix_synapse_experimental_features_msc3202_device_masquerading_enabled: false
+
+# Controls whether to enable the "transaction extensions" for encrypted appservices experimental feature.
+#
+# See:
+# - https://github.com/matrix-org/matrix-spec-proposals/pull/3202
+# - https://matrix-org.github.io/matrix-hookshot/latest/advanced/encryption.html#running-with-synapse
+matrix_synapse_experimental_features_msc3202_transaction_extensions_enabled: false
+
 # Controls whether to enable the "Next-generation auth for Matrix, based on OAuth 2.0/OIDC" experimental feature.
 #
 # See:
@@ -1533,6 +1558,11 @@ matrix_synapse_encryption_enabled_by_default_for_room_type: "off"
 matrix_synapse_trusted_key_servers:
   - server_name: "matrix.org"
 
+
+# Enable the following to disable the warning that is emitted when the
+# matrix_synapse_trusted_key_servers include 'matrix.org'. See above.
+matrix_synapse_suppress_key_server_warning: false
+
 matrix_synapse_redaction_retention_period: 7d
 
 # Controls how long to keep locally forgotten rooms before purging them from the DB.

roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2

@@ -1361,7 +1361,7 @@ registrations_require_3pid: {{ matrix_synapse_registrations_require_3pid|to_json
 # Explicitly disable asking for MSISDNs from the registration
 # flow (overrides registrations_require_3pid if MSISDNs are set as required)
 #
-#disable_msisdn_registration: true
+disable_msisdn_registration: {{ matrix_synapse_disable_msisdn_registration|to_json }}
 
 # Mandate that users are only allowed to associate certain formats of
 # 3PIDs with accounts on this server.
@@ -1746,7 +1746,7 @@ trusted_key_servers: {{ matrix_synapse_trusted_key_servers|to_json }}
 # Uncomment the following to disable the warning that is emitted when the
 # trusted_key_servers include 'matrix.org'. See above.
 #
-#suppress_key_server_warning: true
+suppress_key_server_warning: {{ matrix_synapse_suppress_key_server_warning|to_json }}
 
 # The signing keys to use when acting as a trusted key server. If not specified
 # defaults to the server signing key.
@@ -2970,6 +2970,15 @@ background_updates:
     #default_batch_size: 50
 
 experimental_features:
+  {% if matrix_synapse_experimental_features_msc2409_to_device_messages_enabled %}
+  msc2409_to_device_messages_enabled: true
+  {% endif %}
+  {% if matrix_synapse_experimental_features_msc3202_device_masquerading_enabled %}
+  msc3202_device_masquerading: true
+  {% endif %}
+  {% if matrix_synapse_experimental_features_msc3202_transaction_extensions_enabled %}
+  msc3202_transaction_extensions: true
+  {% endif %}
   {% if matrix_synapse_experimental_features_msc3266_enabled %}
   msc3266_enabled: true
   {% endif %}