Fix compatibility with ansible=6 / ansible-core=2.13
Details here: https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_6.html#id36 Basically: ```yaml - name: Prior to 2.13 debug: msg: '[1] + {{ [2] }}' - name: 2.13 and forward debug: msg: '{{ [1] + [2] }}' ``` Interestingly, we had been using the new/safe syntax in lofs of places. We were using the broken one in many others though. Hopefully all instances were fixed by this patch.
This commit is contained in:
		| @@ -27,11 +27,15 @@ | ||||
|       }} | ||||
|  | ||||
|     matrix_synapse_container_extra_arguments: > | ||||
|       {{ 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"] | ||||
|       {{ | ||||
|         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"] | ||||
|       }} | ||||
|  | ||||
|     matrix_synapse_additional_loggers: > | ||||
|       {{ matrix_synapse_additional_loggers }} | ||||
|       + | ||||
|       {{ [{'name': 'matrix_e2ee_filter', 'level': 'INFO'}] }} | ||||
|       {{ | ||||
|         matrix_synapse_additional_loggers | ||||
|         + | ||||
|         [{'name': 'matrix_e2ee_filter', 'level': 'INFO'}] | ||||
|       }} | ||||
|   | ||||
| @@ -4,7 +4,9 @@ | ||||
|     matrix_synapse_password_providers_enabled: true | ||||
|  | ||||
|     matrix_synapse_additional_loggers: > | ||||
|       {{ matrix_synapse_additional_loggers }} | ||||
|       + | ||||
|       {{ [{'name': 'ldap_auth_provider', 'level': 'INFO'}] }} | ||||
|       {{ | ||||
|         matrix_synapse_additional_loggers | ||||
|        + | ||||
|         [{'name': 'ldap_auth_provider', 'level': 'INFO'}] | ||||
|       }} | ||||
|   when: matrix_synapse_ext_password_provider_ldap_enabled|bool | ||||
|   | ||||
| @@ -34,19 +34,23 @@ | ||||
|  | ||||
| - set_fact: | ||||
|     matrix_synapse_spam_checker: > | ||||
|       {{ matrix_synapse_spam_checker }} | ||||
|       + | ||||
|       [{ | ||||
|         "module": "mjolnir.AntiSpam", | ||||
|         "config": { | ||||
|           "block_invites": {{ matrix_synapse_ext_spam_checker_mjolnir_antispam_config_block_invites }}, | ||||
|           "block_messages": {{ matrix_synapse_ext_spam_checker_mjolnir_antispam_config_block_messages }}, | ||||
|           "block_usernames": {{ matrix_synapse_ext_spam_checker_mjolnir_antispam_config_block_usernames }}, | ||||
|           "ban_lists": {{ matrix_synapse_ext_spam_checker_mjolnir_antispam_config_ban_lists }} | ||||
|         } | ||||
|       }] | ||||
|       {{ | ||||
|         matrix_synapse_spam_checker | ||||
|         + | ||||
|         [{ | ||||
|           "module": "mjolnir.AntiSpam", | ||||
|           "config": { | ||||
|             "block_invites": matrix_synapse_ext_spam_checker_mjolnir_antispam_config_block_invites, | ||||
|             "block_messages": matrix_synapse_ext_spam_checker_mjolnir_antispam_config_block_messages, | ||||
|             "block_usernames": matrix_synapse_ext_spam_checker_mjolnir_antispam_config_block_usernames, | ||||
|             "ban_lists": matrix_synapse_ext_spam_checker_mjolnir_antispam_config_ban_lists, | ||||
|           } | ||||
|         }] | ||||
|       }} | ||||
|  | ||||
|     matrix_synapse_container_extra_arguments: > | ||||
|       {{ 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"] | ||||
|       {{ | ||||
|         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"] | ||||
|       }} | ||||
|   | ||||
| @@ -22,11 +22,15 @@ | ||||
|     matrix_synapse_password_providers_enabled: true | ||||
|  | ||||
|     matrix_synapse_container_extra_arguments: > | ||||
|       {{ 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"] | ||||
|       {{ | ||||
|         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"] | ||||
|       }} | ||||
|  | ||||
|     matrix_synapse_additional_loggers: > | ||||
|       {{ matrix_synapse_additional_loggers }} | ||||
|       + | ||||
|       {{ [{'name': 'rest_auth_provider', 'level': 'INFO'}] }} | ||||
|       {{ | ||||
|         matrix_synapse_additional_loggers | ||||
|         + | ||||
|         [{'name': 'rest_auth_provider', 'level': 'INFO'}] | ||||
|       }} | ||||
|   | ||||
| @@ -37,11 +37,15 @@ | ||||
|       }} | ||||
|  | ||||
|     matrix_synapse_container_extra_arguments: > | ||||
|       {{ 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"] | ||||
|       {{ | ||||
|         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"] | ||||
|       }} | ||||
|  | ||||
|     matrix_synapse_additional_loggers: > | ||||
|       {{ matrix_synapse_additional_loggers }} | ||||
|       + | ||||
|       {{ [{'name': 'shared_secret_authenticator', 'level': 'INFO'}] }} | ||||
|       {{ | ||||
|         matrix_synapse_additional_loggers | ||||
|         + | ||||
|         [{'name': 'shared_secret_authenticator', 'level': 'INFO'}] | ||||
|       }} | ||||
|   | ||||
| @@ -39,16 +39,20 @@ | ||||
|  | ||||
| - set_fact: | ||||
|     matrix_synapse_modules: > | ||||
|       {{ matrix_synapse_modules }} | ||||
|       + | ||||
|       [{ | ||||
|         "module": "synapse_simple_antispam.AntiSpamInvites", | ||||
|         "config": { | ||||
|           "blocked_homeservers": {{ matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers }} | ||||
|         } | ||||
|       }] | ||||
|       {{ | ||||
|         matrix_synapse_modules | ||||
|         + | ||||
|         [{ | ||||
|           "module": "synapse_simple_antispam.AntiSpamInvites", | ||||
|           "config": { | ||||
|             "blocked_homeservers": matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers | ||||
|           } | ||||
|         }] | ||||
|       }} | ||||
|  | ||||
|     matrix_synapse_container_extra_arguments: > | ||||
|       {{ 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"] | ||||
|       {{ | ||||
|         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"] | ||||
|       }} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user