From 3a11a32f9ebebb8557a3b4344f48f020ada77ab1 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 26 Jul 2025 19:09:08 +0300 Subject: [PATCH] Do not rely on ansible-core>=2.19.0 to process Jinja blocks inside strings found in other strings blocks Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4445 --- .../tasks/ext/encryption-disabler/setup_install.yml | 2 +- .../matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml | 2 +- .../custom/matrix-synapse/tasks/ext/rest-auth/setup_install.yml | 2 +- .../tasks/ext/shared-secret-auth/setup_install.yml | 2 +- .../tasks/ext/synapse-http-antispam/setup_install.yml | 2 +- .../tasks/ext/synapse-simple-antispam/setup_install.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/custom/matrix-synapse/tasks/ext/encryption-disabler/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/encryption-disabler/setup_install.yml index 97ee49673..69cb16ce1 100644 --- a/roles/custom/matrix-synapse/tasks/ext/encryption-disabler/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/ext/encryption-disabler/setup_install.yml @@ -35,7 +35,7 @@ {{ matrix_synapse_container_extra_arguments | default([]) + - ["--mount type=bind,src={{ matrix_synapse_ext_path }}/matrix_e2ee_filter.py,dst={{ matrix_synapse_in_container_python_packages_path }}/matrix_e2ee_filter.py,ro"] + ["--mount type=bind,src=" + matrix_synapse_ext_path + "/matrix_e2ee_filter.py,dst=" + matrix_synapse_in_container_python_packages_path + "/matrix_e2ee_filter.py,ro"] }} matrix_synapse_additional_loggers_auto: > diff --git a/roles/custom/matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml index ea43bb34a..d6c8429d5 100644 --- a/roles/custom/matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml @@ -35,5 +35,5 @@ {{ matrix_synapse_container_extra_arguments | default([]) + - ["--mount type=bind,src={{ matrix_synapse_ext_path }}/mjolnir/synapse_antispam/mjolnir,dst={{ matrix_synapse_in_container_python_packages_path }}/mjolnir,ro"] + ["--mount type=bind,src=" + matrix_synapse_ext_path + "/mjolnir/synapse_antispam/mjolnir,dst=" + matrix_synapse_in_container_python_packages_path + "/mjolnir,ro"] }} diff --git a/roles/custom/matrix-synapse/tasks/ext/rest-auth/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/rest-auth/setup_install.yml index d50a32cd9..cfd1d25c6 100644 --- a/roles/custom/matrix-synapse/tasks/ext/rest-auth/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/ext/rest-auth/setup_install.yml @@ -32,7 +32,7 @@ {{ matrix_synapse_container_extra_arguments | default([]) + - ["--mount type=bind,src={{ matrix_synapse_ext_path }}/rest_auth_provider.py,dst={{ matrix_synapse_in_container_python_packages_path }}/rest_auth_provider.py,ro"] + ["--mount type=bind,src=" + matrix_synapse_ext_path + "/rest_auth_provider.py,dst=" + matrix_synapse_in_container_python_packages_path + "/rest_auth_provider.py,ro"] }} matrix_synapse_additional_loggers_auto: > diff --git a/roles/custom/matrix-synapse/tasks/ext/shared-secret-auth/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/shared-secret-auth/setup_install.yml index ac09fe46e..d568f935b 100644 --- a/roles/custom/matrix-synapse/tasks/ext/shared-secret-auth/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/ext/shared-secret-auth/setup_install.yml @@ -47,7 +47,7 @@ {{ matrix_synapse_container_extra_arguments | default([]) + - ["--mount type=bind,src={{ matrix_synapse_ext_path }}/shared_secret_authenticator.py,dst={{ matrix_synapse_in_container_python_packages_path }}/shared_secret_authenticator.py,ro"] + ["--mount type=bind,src=" + matrix_synapse_ext_path + "/shared_secret_authenticator.py,dst=" + matrix_synapse_in_container_python_packages_path + "/shared_secret_authenticator.py,ro"] }} matrix_synapse_additional_loggers_auto: > diff --git a/roles/custom/matrix-synapse/tasks/ext/synapse-http-antispam/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/synapse-http-antispam/setup_install.yml index aecb68e4e..f7ce74096 100644 --- a/roles/custom/matrix-synapse/tasks/ext/synapse-http-antispam/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/ext/synapse-http-antispam/setup_install.yml @@ -33,5 +33,5 @@ {{ matrix_synapse_container_extra_arguments | default([]) + - ["--mount type=bind,src={{ matrix_synapse_ext_path }}/synapse-http-antispam/synapse_http_antispam.py,dst={{ matrix_synapse_in_container_python_packages_path }}/synapse_http_antispam.py,ro"] + ["--mount type=bind,src=" + matrix_synapse_ext_path + "/synapse-http-antispam/synapse_http_antispam.py,dst=" + matrix_synapse_in_container_python_packages_path + "/synapse_http_antispam.py,ro"] }} diff --git a/roles/custom/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml index 8f2b4ac6e..2a5a24b2b 100644 --- a/roles/custom/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml +++ b/roles/custom/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml @@ -44,5 +44,5 @@ {{ matrix_synapse_container_extra_arguments | default([]) + - ["--mount type=bind,src={{ matrix_synapse_ext_path }}/synapse-simple-antispam/synapse_simple_antispam,dst={{ matrix_synapse_in_container_python_packages_path }}/synapse_simple_antispam,ro"] + ["--mount type=bind,src=" + matrix_synapse_ext_path + "/synapse-simple-antispam/synapse_simple_antispam,dst=" + matrix_synapse_in_container_python_packages_path + "/synapse_simple_antispam,ro"] }}