Merge branch 'spantaleev:master' into master

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

@@ -11,7 +11,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme
 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.77
+matrix_client_element_version: v1.11.78
 
 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 }}"

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

@@ -14,7 +14,7 @@ matrix_synapse_admin_container_image_self_build: false
 matrix_synapse_admin_container_image_self_build_repo: "https://github.com/etkecc/synapse-admin.git"
 
 # renovate: datasource=docker depName=ghcr.io/etkecc/synapse-admin
-matrix_synapse_admin_version: v0.10.3-etke14
+matrix_synapse_admin_version: v0.10.3-etke16
 matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_name_prefix }}etkecc/synapse-admin:{{ matrix_synapse_admin_version }}"
 matrix_synapse_admin_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else 'ghcr.io/' }}"
 matrix_synapse_admin_docker_image_force_pull: "{{ matrix_synapse_admin_docker_image.endswith(':latest') }}"
@@ -174,3 +174,23 @@ matrix_synapse_admin_configuration: "{{ matrix_synapse_admin_configuration_defau
 # Controls the restrictBaseUrl configuration setting, which, if defined,
 # restricts the homeserver(s), so that the user can no longer define a homeserver manually during login.
 matrix_synapse_admin_config_restrictBaseUrl: "{{ [matrix_homeserver_url] }}"  # noqa var-naming
+
+# Controls the asManagedUsers configuration setting (managed by playbook), which, if defined,
+# restricts modifications of the specified users (e.g., bridge-managed).
+# You should use JS regex syntax to match the user IDs.
+# Example for mautrix-telegram: ["^@telegram_[a-zA-Z0-9]+:example\\.com$"]
+# WARNING: you want to use matrix_synapse_admin_config_asManagedUsers_custom instead of this variable.
+matrix_synapse_admin_config_asManagedUsers_auto: []  # noqa var-naming
+
+# Controls the asManagedUsers configuration setting (managed per host), which, if defined,
+# restricts modifications of the specified users (e.g., bridge-managed).
+# You should use JS regex syntax to match the user IDs.
+# Example for mautrix-telegram: ["^@telegram_[a-zA-Z0-9]+:example\\.com$"]
+matrix_synapse_admin_config_asManagedUsers_custom: []  # noqa var-naming
+
+# Controls the asManagedUsers configuration setting, which, if defined,
+# restricts modifications of the specified users (e.g., bridge-managed).
+# You should use JS regex syntax to match the user IDs.
+# Example for mautrix-telegram: ["^@telegram_[a-zA-Z0-9]+:example\\.com$"]
+# WARNING: you want to use matrix_synapse_admin_config_asManagedUsers_custom instead of this variable.
+matrix_synapse_admin_config_asManagedUsers: "{{ matrix_synapse_admin_config_asManagedUsers_auto + matrix_synapse_admin_config_asManagedUsers_custom }}"  # noqa var-naming

roles/custom/matrix-synapse-admin/templates/config.json.j2

@@ -1,3 +1,4 @@
 {
-	"restrictBaseUrl": {{ matrix_synapse_admin_config_restrictBaseUrl | to_json }}
+	"restrictBaseUrl": {{ matrix_synapse_admin_config_restrictBaseUrl | to_json }},
+	"asManagedUsers": {{ matrix_synapse_admin_config_asManagedUsers | to_json }}
 }