finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compatibility with ansible=6 / ansible-core=2.13

Browse Source 
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:
Slavi Pantaleev 2022-05-18 15:43:39 +03:00
parent 98fecf95a6
commit 677a2fc503
29 changed files with 298 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/matrix-bridge-appservice-discord/tasks/init.yml
View File

@ -14,12 +14,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_appservice_discord_config_path }}/registration.yaml,dst=/matrix-appservice-discord-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-appservice-discord-registration.yaml"] }}
["/matrix-appservice-discord-registration.yaml"]
}}
when: matrix_appservice_discord_enabled|bool

10
roles/matrix-bridge-appservice-irc/tasks/init.yml
View File

@ -21,12 +21,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_appservice_irc_config_path }}/registration.yaml,dst=/matrix-appservice-irc-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-appservice-irc-registration.yaml"] }}
["/matrix-appservice-irc-registration.yaml"]
}}
when: matrix_appservice_irc_enabled|bool

10
roles/matrix-bridge-appservice-slack/tasks/init.yml
View File

@ -21,14 +21,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_appservice_slack_config_path }}/slack-registration.yaml,dst=/matrix-appservice-slack-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-appservice-slack-registration.yaml"] }}
["/matrix-appservice-slack-registration.yaml"]
}}
when: matrix_appservice_slack_enabled|bool
# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.

10
roles/matrix-bridge-appservice-webhooks/tasks/init.yml
View File

@ -14,14 +14,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_appservice_webhooks_config_path }}/webhooks-registration.yaml,dst=/matrix-appservice-webhooks-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-appservice-webhooks-registration.yaml"] }}
["/matrix-appservice-webhooks-registration.yaml"]
}}
when: matrix_appservice_webhooks_enabled|bool
# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.

10
roles/matrix-bridge-beeper-linkedin/tasks/init.yml
View File

@ -7,12 +7,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_beeper_linkedin_config_path }}/registration.yaml,dst=/matrix-beeper-linkedin-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-beeper-linkedin-registration.yaml"] }}
["/matrix-beeper-linkedin-registration.yaml"]
}}
when: matrix_beeper_linkedin_enabled|bool

10
roles/matrix-bridge-heisenbridge/tasks/init.yml
View File

@ -14,12 +14,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_heisenbridge_base_path }}/registration.yaml,dst=/heisenbridge-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/heisenbridge-registration.yaml"] }}
["/heisenbridge-registration.yaml"]
}}
when: matrix_heisenbridge_enabled|bool

10
roles/matrix-bridge-hookshot/tasks/init.yml
View File

@ -14,14 +14,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_hookshot_base_path }}/registration.yml,dst=/hookshot-registration.yml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/hookshot-registration.yml"] }}
["/hookshot-registration.yml"]
}}
when: matrix_hookshot_enabled|bool
- block:

10
roles/matrix-bridge-mautrix-facebook/tasks/init.yml
View File

@ -13,14 +13,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mautrix_facebook_config_path }}/registration.yaml,dst=/matrix-mautrix-facebook-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mautrix-facebook-registration.yaml"] }}
["/matrix-mautrix-facebook-registration.yaml"]
}}
when: matrix_mautrix_facebook_enabled|bool
- block:

10
roles/matrix-bridge-mautrix-googlechat/tasks/init.yml
View File

@ -13,14 +13,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mautrix_googlechat_config_path }}/registration.yaml,dst=/matrix-mautrix-googlechat-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mautrix-googlechat-registration.yaml"] }}
["/matrix-mautrix-googlechat-registration.yaml"]
}}
when: matrix_mautrix_googlechat_enabled|bool
- block:

10
roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
View File

@ -13,14 +13,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mautrix_hangouts_config_path }}/registration.yaml,dst=/matrix-mautrix-hangouts-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mautrix-hangouts-registration.yaml"] }}
["/matrix-mautrix-hangouts-registration.yaml"]
}}
when: matrix_mautrix_hangouts_enabled|bool
- block:

10
roles/matrix-bridge-mautrix-instagram/tasks/init.yml
View File

@ -13,12 +13,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mautrix_instagram_config_path }}/registration.yaml,dst=/matrix-mautrix-instagram-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mautrix-instagram-registration.yaml"] }}
["/matrix-mautrix-instagram-registration.yaml"]
}}
when: matrix_mautrix_instagram_enabled|bool

10
roles/matrix-bridge-mautrix-signal/tasks/init.yml
View File

@ -7,12 +7,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mautrix_signal_config_path }}/registration.yaml,dst=/matrix-mautrix-signal-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mautrix-signal-registration.yaml"] }}
["/matrix-mautrix-signal-registration.yaml"]
}}
when: matrix_mautrix_signal_enabled|bool

10
roles/matrix-bridge-mautrix-telegram/tasks/init.yml
View File

@ -13,14 +13,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mautrix_telegram_config_path }}/registration.yaml,dst=/matrix-mautrix-telegram-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mautrix-telegram-registration.yaml"] }}
["/matrix-mautrix-telegram-registration.yaml"]
}}
when: matrix_mautrix_telegram_enabled|bool
- block:

10
roles/matrix-bridge-mautrix-twitter/tasks/init.yml
View File

@ -7,14 +7,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mautrix_twitter_config_path }}/registration.yaml,dst=/matrix-mautrix-twitter-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mautrix-twitter-registration.yaml"] }}
["/matrix-mautrix-twitter-registration.yaml"]
}}
when: matrix_mautrix_twitter_enabled|bool
# ansible lower than 2.8, does not support docker_image build parameters

10
roles/matrix-bridge-mautrix-whatsapp/tasks/init.yml
View File

@ -6,12 +6,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mautrix_whatsapp_config_path }}/registration.yaml,dst=/matrix-mautrix-whatsapp-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mautrix-whatsapp-registration.yaml"] }}
["/matrix-mautrix-whatsapp-registration.yaml"]
}}
when: matrix_mautrix_whatsapp_enabled|bool

10
roles/matrix-bridge-mx-puppet-discord/tasks/init.yml
View File

@ -13,12 +13,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mx_puppet_discord_config_path }}/registration.yaml,dst=/matrix-mx-puppet-discord-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mx-puppet-discord-registration.yaml"] }}
["/matrix-mx-puppet-discord-registration.yaml"]
}}
when: matrix_mx_puppet_discord_enabled|bool

10
roles/matrix-bridge-mx-puppet-groupme/tasks/init.yml
View File

@ -13,12 +13,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mx_puppet_groupme_config_path }}/registration.yaml,dst=/matrix-mx-puppet-groupme-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mx-puppet-groupme-registration.yaml"] }}
["/matrix-mx-puppet-groupme-registration.yaml"]
}}
when: matrix_mx_puppet_groupme_enabled|bool

10
roles/matrix-bridge-mx-puppet-instagram/tasks/init.yml
View File

@ -13,12 +13,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mx_puppet_instagram_config_path }}/registration.yaml,dst=/matrix-mx-puppet-instagram-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mx-puppet-instagram-registration.yaml"] }}
["/matrix-mx-puppet-instagram-registration.yaml"]
}}
when: matrix_mx_puppet_instagram_enabled|bool

10
roles/matrix-bridge-mx-puppet-skype/tasks/init.yml
View File

@ -13,12 +13,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mx_puppet_skype_config_path }}/registration.yaml,dst=/matrix-mx-puppet-skype-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mx-puppet-skype-registration.yaml"] }}
["/matrix-mx-puppet-skype-registration.yaml"]
}}
when: matrix_mx_puppet_skype_enabled|bool

10
roles/matrix-bridge-mx-puppet-slack/tasks/init.yml
View File

@ -13,14 +13,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mx_puppet_slack_config_path }}/registration.yaml,dst=/matrix-mx-puppet-slack-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mx-puppet-slack-registration.yaml"] }}
["/matrix-mx-puppet-slack-registration.yaml"]
}}
when: matrix_mx_puppet_slack_enabled|bool
- block:

10
roles/matrix-bridge-mx-puppet-steam/tasks/init.yml
View File

@ -13,12 +13,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mx_puppet_steam_config_path }}/registration.yaml,dst=/matrix-mx-puppet-steam-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mx-puppet-steam-registration.yaml"] }}
["/matrix-mx-puppet-steam-registration.yaml"]
}}
when: matrix_mx_puppet_steam_enabled|bool

10
roles/matrix-bridge-mx-puppet-twitter/tasks/init.yml
View File

@ -13,14 +13,18 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_mx_puppet_twitter_config_path }}/registration.yaml,dst=/matrix-mx-puppet-twitter-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-mx-puppet-twitter-registration.yaml"] }}
["/matrix-mx-puppet-twitter-registration.yaml"]
}}
when: matrix_mx_puppet_twitter_enabled|bool
- block:

10
roles/matrix-bridge-sms/tasks/init.yml
View File

@ -15,12 +15,16 @@
# If the matrix-synapse role is not used, these variables may not exist.
- set_fact:
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
matrix_synapse_container_extra_arguments|default([])
+
["--mount type=bind,src={{ matrix_sms_bridge_config_path }}/registration.yaml,dst=/matrix-sms-bridge-registration.yaml,ro"]
}}
matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
{{
matrix_synapse_app_service_config_files|default([])
+
{{ ["/matrix-sms-bridge-registration.yaml"] }}
["/matrix-sms-bridge-registration.yaml"]
}}
when: matrix_sms_bridge_enabled|bool

10
roles/matrix-synapse/tasks/ext/encryption-disabler/setup_install.yml
View File

@ -27,11 +27,15 @@
}}
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
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 }}
{{
matrix_synapse_additional_loggers
+
{{ [{'name': 'matrix_e2ee_filter', 'level': 'INFO'}] }}
[{'name': 'matrix_e2ee_filter', 'level': 'INFO'}]
}}

6
roles/matrix-synapse/tasks/ext/ldap-auth/setup.yml
View File

@ -4,7 +4,9 @@
matrix_synapse_password_providers_enabled: true
matrix_synapse_additional_loggers: >
{{ matrix_synapse_additional_loggers }}
{{
matrix_synapse_additional_loggers
+
{{ [{'name': 'ldap_auth_provider', 'level': 'INFO'}] }}
[{'name': 'ldap_auth_provider', 'level': 'INFO'}]
}}
when: matrix_synapse_ext_password_provider_ldap_enabled|bool

16
roles/matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml
View File

@ -34,19 +34,23 @@
- set_fact:
matrix_synapse_spam_checker: >
{{ 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 }}
"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([]) }}
{{
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"]
}}

10
roles/matrix-synapse/tasks/ext/rest-auth/setup_install.yml
View File

@ -22,11 +22,15 @@
matrix_synapse_password_providers_enabled: true
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
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 }}
{{
matrix_synapse_additional_loggers
+
{{ [{'name': 'rest_auth_provider', 'level': 'INFO'}] }}
[{'name': 'rest_auth_provider', 'level': 'INFO'}]
}}

10
roles/matrix-synapse/tasks/ext/shared-secret-auth/setup_install.yml
View File

@ -37,11 +37,15 @@
}}
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
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 }}
{{
matrix_synapse_additional_loggers
+
{{ [{'name': 'shared_secret_authenticator', 'level': 'INFO'}] }}
[{'name': 'shared_secret_authenticator', 'level': 'INFO'}]
}}

10
roles/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml
View File

@ -39,16 +39,20 @@
- set_fact:
matrix_synapse_modules: >
{{ 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 }}
"blocked_homeservers": matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers
}
}]
}}
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
{{
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"]
}}