From 997e6ca6113107dc388469674b86765f59818c5b Mon Sep 17 00:00:00 2001 From: Aine Date: Sat, 26 Jul 2025 22:44:55 +0100 Subject: [PATCH] fix synapse-admin for ansible-core>=2.19.0. Related to #4445 --- roles/custom/matrix-synapse-admin/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse-admin/defaults/main.yml b/roles/custom/matrix-synapse-admin/defaults/main.yml index 0691e60a4..b42675d95 100644 --- a/roles/custom/matrix-synapse-admin/defaults/main.yml +++ b/roles/custom/matrix-synapse-admin/defaults/main.yml @@ -189,7 +189,7 @@ matrix_synapse_admin_configuration_extension_json: '{}' # This is similar to `matrix_synapse_admin_configuration_extension_json`, but intended for use by playbook or group vars matrix_synapse_admin_configuration_extension_json_auto: {} -matrix_synapse_admin_configuration_extension: "{{ matrix_synapse_admin_configuration_extension_json_auto | combine(matrix_synapse_admin_configuration_extension_json | from_json if matrix_synapse_admin_configuration_extension_json | from_json is mapping else {}, recursive=True) }}" +matrix_synapse_admin_configuration_extension: "{{ matrix_synapse_admin_configuration_extension_json_auto | from_json | combine(matrix_synapse_admin_configuration_extension_json | from_json if matrix_synapse_admin_configuration_extension_json | from_json is mapping else {}, recursive=True) }}" # Holds the final synapse-admin configuration (a combination of the default and its extension). # You most likely don't need to touch this variable. Instead, see `matrix_synapse_admin_configuration_default`.