appservice: add and use homeserver_container_* vars (#2045)

* appservice: add and use matrix_homeserver_* vars

* appservice: use the new vars

* Apply suggestions from code review

Co-authored-by: Slavi Pantaleev <slavi@devture.com>

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
This commit is contained in:
Shaleen Jain 2022-08-24 11:08:12 +05:30 committed by GitHub
parent 521e435ee9
commit f674afe5e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 158 additions and 105 deletions

View file

@ -2331,6 +2331,9 @@ matrix_synapse_redis_enabled: "{{ matrix_redis_enabled }}"
matrix_synapse_redis_host: "{{ 'matrix-redis' if matrix_redis_enabled else '' }}" matrix_synapse_redis_host: "{{ 'matrix-redis' if matrix_redis_enabled else '' }}"
matrix_synapse_redis_password: "{{ matrix_redis_connection_password if matrix_redis_enabled else '' }}" matrix_synapse_redis_password: "{{ matrix_redis_connection_password if matrix_redis_enabled else '' }}"
matrix_synapse_container_runtime_injected_arguments: "{{ matrix_homeserver_container_runtime_injected_arguments }}"
matrix_synapse_app_service_runtime_injected_config_files: "{{ matrix_homeserver_app_service_runtime_injected_config_files }}"
###################################################################### ######################################################################
# #
# /matrix-synapse # /matrix-synapse
@ -2596,6 +2599,9 @@ matrix_dendrite_systemd_wanted_services_list: |
(['matrix-coturn.service'] if matrix_coturn_enabled else []) (['matrix-coturn.service'] if matrix_coturn_enabled else [])
}} }}
matrix_dendrite_container_runtime_injected_arguments: "{{ matrix_homeserver_container_runtime_injected_arguments }}"
matrix_dendrite_app_service_runtime_injected_config_files: "{{ matrix_homeserver_app_service_runtime_injected_config_files }}"
###################################################################### ######################################################################
# #
# /matrix-dendrite # /matrix-dendrite

View file

@ -2,3 +2,6 @@
# This will contain a list of enabled services that the playbook is managing. # This will contain a list of enabled services that the playbook is managing.
# Each component is expected to append its service name to this list. # Each component is expected to append its service name to this list.
matrix_systemd_services_list: [] matrix_systemd_services_list: []
matrix_homeserver_container_runtime_injected_arguments: []
matrix_homeserver_app_service_runtime_injected_config_files: []

View file

@ -13,16 +13,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_appservice_discord_config_path }}/registration.yaml,dst=/matrix-appservice-discord-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-appservice-discord-registration.yaml"] ["/matrix-appservice-discord-registration.yaml"]
}} }}

View file

@ -20,16 +20,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_appservice_irc_config_path }}/registration.yaml,dst=/matrix-appservice-irc-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-appservice-irc-registration.yaml"] ["/matrix-appservice-irc-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_appservice_kakaotalk_config_path }}/registration.yaml,dst=/matrix-appservice-kakaotalk-registration.yaml,ro"] ["--mount type=bind,src={{ matrix_appservice_kakaotalk_config_path }}/registration.yaml,dst=/matrix-appservice-kakaotalk-registration.yaml,ro"]
}} }}
matrix_synapse_app_service_config_files: > matrix_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-appservice-kakaotalk-registration.yaml"] ["/matrix-appservice-kakaotalk-registration.yaml"]
}} }}

View file

@ -20,16 +20,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_appservice_slack_config_path }}/slack-registration.yaml,dst=/matrix-appservice-slack-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-appservice-slack-registration.yaml"] ["/matrix-appservice-slack-registration.yaml"]
}} }}

View file

@ -13,16 +13,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_appservice_webhooks_config_path }}/webhooks-registration.yaml,dst=/matrix-appservice-webhooks-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-appservice-webhooks-registration.yaml"] ["/matrix-appservice-webhooks-registration.yaml"]
}} }}

View file

@ -6,16 +6,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_beeper_linkedin_config_path }}/registration.yaml,dst=/matrix-beeper-linkedin-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-beeper-linkedin-registration.yaml"] ["/matrix-beeper-linkedin-registration.yaml"]
}} }}

View file

@ -5,16 +5,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_go_skype_bridge_config_path }}/registration.yaml,dst=/matrix-go-skype-bridge-registration.yaml,ro"] ["--mount type=bind,src={{ matrix_go_skype_bridge_config_path }}/registration.yaml,dst=/matrix-go-skype-bridge-registration.yaml,ro"]
}} }}
matrix_synapse_app_service_config_files: > matrix_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-go-skype-bridge-registration.yaml"] ["/matrix-go-skype-bridge-registration.yaml"]
}} }}

View file

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

View file

@ -13,16 +13,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_hookshot_base_path }}/registration.yml,dst=/hookshot-registration.yml,ro"] ["--mount type=bind,src={{ matrix_hookshot_base_path }}/registration.yml,dst=/hookshot-registration.yml,ro"]
}} }}
matrix_synapse_app_service_config_files: > matrix_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/hookshot-registration.yml"] ["/hookshot-registration.yml"]
}} }}

View file

@ -5,16 +5,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mautrix_discord_config_path }}/registration.yaml,dst=/matrix-mautrix-discord-registration.yaml,ro"] ["--mount type=bind,src={{ matrix_mautrix_discord_config_path }}/registration.yaml,dst=/matrix-mautrix-discord-registration.yaml,ro"]
}} }}
matrix_synapse_app_service_config_files: > matrix_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mautrix-discord-registration.yaml"] ["/matrix-mautrix-discord-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mautrix_facebook_config_path }}/registration.yaml,dst=/matrix-mautrix-facebook-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mautrix-facebook-registration.yaml"] ["/matrix-mautrix-facebook-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mautrix_googlechat_config_path }}/registration.yaml,dst=/matrix-mautrix-googlechat-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mautrix-googlechat-registration.yaml"] ["/matrix-mautrix-googlechat-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mautrix_hangouts_config_path }}/registration.yaml,dst=/matrix-mautrix-hangouts-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mautrix-hangouts-registration.yaml"] ["/matrix-mautrix-hangouts-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mautrix_instagram_config_path }}/registration.yaml,dst=/matrix-mautrix-instagram-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mautrix-instagram-registration.yaml"] ["/matrix-mautrix-instagram-registration.yaml"]
}} }}

View file

@ -6,16 +6,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mautrix_signal_config_path }}/registration.yaml,dst=/matrix-mautrix-signal-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mautrix-signal-registration.yaml"] ["/matrix-mautrix-signal-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mautrix_telegram_config_path }}/registration.yaml,dst=/matrix-mautrix-telegram-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mautrix-telegram-registration.yaml"] ["/matrix-mautrix-telegram-registration.yaml"]
}} }}

View file

@ -6,16 +6,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mautrix_twitter_config_path }}/registration.yaml,dst=/matrix-mautrix-twitter-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mautrix-twitter-registration.yaml"] ["/matrix-mautrix-twitter-registration.yaml"]
}} }}

View file

@ -5,16 +5,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mautrix_whatsapp_config_path }}/registration.yaml,dst=/matrix-mautrix-whatsapp-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mautrix-whatsapp-registration.yaml"] ["/matrix-mautrix-whatsapp-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mx_puppet_discord_config_path }}/registration.yaml,dst=/matrix-mx-puppet-discord-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mx-puppet-discord-registration.yaml"] ["/matrix-mx-puppet-discord-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mx_puppet_groupme_config_path }}/registration.yaml,dst=/matrix-mx-puppet-groupme-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mx-puppet-groupme-registration.yaml"] ["/matrix-mx-puppet-groupme-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mx_puppet_instagram_config_path }}/registration.yaml,dst=/matrix-mx-puppet-instagram-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mx-puppet-instagram-registration.yaml"] ["/matrix-mx-puppet-instagram-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mx_puppet_slack_config_path }}/registration.yaml,dst=/matrix-mx-puppet-slack-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mx-puppet-slack-registration.yaml"] ["/matrix-mx-puppet-slack-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mx_puppet_steam_config_path }}/registration.yaml,dst=/matrix-mx-puppet-steam-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mx-puppet-steam-registration.yaml"] ["/matrix-mx-puppet-steam-registration.yaml"]
}} }}

View file

@ -12,16 +12,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_mx_puppet_twitter_config_path }}/registration.yaml,dst=/matrix-mx-puppet-twitter-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-mx-puppet-twitter-registration.yaml"] ["/matrix-mx-puppet-twitter-registration.yaml"]
}} }}

View file

@ -14,16 +14,16 @@
# If the matrix-synapse role is not used, these variables may not exist. # If the matrix-synapse role is not used, these variables may not exist.
- ansible.builtin.set_fact: - ansible.builtin.set_fact:
matrix_synapse_container_extra_arguments: > matrix_homeserver_container_runtime_injected_arguments: >
{{ {{
matrix_synapse_container_extra_arguments | default([]) matrix_homeserver_container_runtime_injected_arguments | default([])
+ +
["--mount type=bind,src={{ matrix_sms_bridge_config_path }}/registration.yaml,dst=/matrix-sms-bridge-registration.yaml,ro"] ["--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_homeserver_app_service_runtime_injected_config_files: >
{{ {{
matrix_synapse_app_service_config_files | default([]) matrix_homeserver_app_service_runtime_injected_config_files | default([])
+ +
["/matrix-sms-bridge-registration.yaml"] ["/matrix-sms-bridge-registration.yaml"]
}} }}

View file

@ -43,8 +43,19 @@ matrix_dendrite_container_http_host_bind_address: ""
matrix_dendrite_container_https_host_bind_address: "" matrix_dendrite_container_https_host_bind_address: ""
# A list of extra arguments to pass to the container (`docker run` command) # A list of extra arguments to pass to the container (`docker run` command)
# Also see `matrix_dendrite_container_arguments`
matrix_dendrite_container_extra_arguments: [] matrix_dendrite_container_extra_arguments: []
# matrix_dendrite_container_runtime_injected_arguments is a list of extra arguments to pass to the container.
# This list is built during runtime. You're not meant to override this variable.
# If you'd like to inject your own arguments, see `matrix_dendrite_container_extra_arguments`.
matrix_dendrite_container_runtime_injected_arguments: []
# matrix_dendrite_container_arguments holds the final list of extra arguments to pass to the container.
# You're not meant to override this variable.
# If you'd like to inject your own arguments, see `matrix_dendrite_container_extra_arguments`.
matrix_dendrite_container_arguments: "{{ matrix_dendrite_container_extra_arguments + matrix_dendrite_container_runtime_injected_arguments }}"
# A list of extra arguments to pass to the container process (`dendrite-monolith` command) # A list of extra arguments to pass to the container process (`dendrite-monolith` command)
# Example: # Example:
# matrix_dendrite_process_extra_arguments: # matrix_dendrite_process_extra_arguments:
@ -104,8 +115,19 @@ matrix_dendrite_container_additional_volumes: []
# A list of appservice config files (in-container filesystem paths). # A list of appservice config files (in-container filesystem paths).
# This list gets populated dynamically based on Dendrite extensions that have been enabled. # This list gets populated dynamically based on Dendrite extensions that have been enabled.
# You may wish to use this together with `matrix_dendrite_container_additional_volumes` or `matrix_dendrite_container_extra_arguments`. # You may wish to use this together with `matrix_dendrite_container_additional_volumes` or `matrix_dendrite_container_extra_arguments`.
# Also see `matrix_dendrite_app_service_config_files_final`
matrix_dendrite_app_service_config_files: [] matrix_dendrite_app_service_config_files: []
# matrix_dendrite_app_service_runtime_injected_config_files is a list of appservice config files.
# This list is built during runtime. You're not meant to override this variable.
# If you'd like to inject your own arguments, see `matrix_dendrite_app_service_config_files`.
matrix_dendrite_app_service_runtime_injected_config_files: []
# matrix_dendrite_app_service_config_files_final holds the final list of config files to pass to the container.
# You're not meant to override this variable.
# If you'd like to inject your own arguments, see `matrix_dendrite_app_service_config_files`.
matrix_dendrite_app_service_config_files_final: "{{ matrix_dendrite_app_service_config_files + matrix_dendrite_app_service_runtime_injected_config_files }}"
# Enable exposure of metrics # Enable exposure of metrics
matrix_dendrite_metrics_enabled: false matrix_dendrite_metrics_enabled: false
matrix_dendrite_metrics_username: "metrics" matrix_dendrite_metrics_username: "metrics"

View file

@ -145,7 +145,7 @@ app_service_api:
disable_tls_validation: {{ matrix_dendrite_disable_tls_validation|to_json }} disable_tls_validation: {{ matrix_dendrite_disable_tls_validation|to_json }}
# Appservice configuration files to load into this homeserver. # Appservice configuration files to load into this homeserver.
config_files: {{ matrix_dendrite_app_service_config_files|to_json }} config_files: {{ matrix_dendrite_app_service_config_files_final|to_json }}
# Configuration for the Client API. # Configuration for the Client API.
client_api: client_api:

View file

@ -41,7 +41,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-dendrite \
{% for volume in matrix_dendrite_container_additional_volumes %} {% for volume in matrix_dendrite_container_additional_volumes %}
-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \ -v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
{% endfor %} {% endfor %}
{% for arg in matrix_dendrite_container_extra_arguments %} {% for arg in matrix_dendrite_container_arguments %}
{{ arg }} \ {{ arg }} \
{% endfor %} {% endfor %}
{{ matrix_dendrite_docker_image }} \ {{ matrix_dendrite_docker_image }} \

View file

@ -61,8 +61,19 @@ matrix_synapse_container_metrics_api_host_bind_port: ''
matrix_synapse_container_manhole_api_host_bind_port: '' matrix_synapse_container_manhole_api_host_bind_port: ''
# A list of extra arguments to pass to the container # A list of extra arguments to pass to the container
# Also see `matrix_synapse_container_arguments`
matrix_synapse_container_extra_arguments: [] matrix_synapse_container_extra_arguments: []
# matrix_synapse_container_runtime_injected_arguments is a list of extra arguments to pass to the container.
# This list is built during runtime. You're not meant to override this variable.
# If you'd like to inject your own arguments, see `matrix_synapse_container_extra_arguments`.
matrix_synapse_container_runtime_injected_arguments: []
# matrix_synapse_container_arguments holds the final list of extra arguments to pass to the container.
# You're not meant to override this variable.
# If you'd like to inject your own arguments, see `matrix_synapse_container_extra_arguments`.
matrix_synapse_container_arguments: "{{ matrix_synapse_container_extra_arguments + matrix_synapse_container_runtime_injected_arguments }}"
# List of systemd services that matrix-synapse.service depends on # List of systemd services that matrix-synapse.service depends on
matrix_synapse_systemd_required_services_list: ['docker.service'] matrix_synapse_systemd_required_services_list: ['docker.service']
@ -324,8 +335,19 @@ matrix_synapse_additional_loggers: []
# A list of appservice config files (in-container filesystem paths). # A list of appservice config files (in-container filesystem paths).
# This list gets populated dynamically based on Synapse extensions that have been enabled. # This list gets populated dynamically based on Synapse extensions that have been enabled.
# You may wish to use this together with `matrix_synapse_container_additional_volumes` or `matrix_synapse_container_extra_arguments`. # You may wish to use this together with `matrix_synapse_container_additional_volumes` or `matrix_synapse_container_extra_arguments`.
# Also see `matrix_synapse_app_service_config_files_final`
matrix_synapse_app_service_config_files: [] matrix_synapse_app_service_config_files: []
# matrix_synapse_app_service_runtime_injected_config_files is a list of appservice config files.
# This list is built during runtime. You're not meant to override this variable.
# If you'd like to inject your own arguments, see `matrix_synapse_app_service_config_files`.
matrix_synapse_app_service_runtime_injected_config_files: []
# matrix_synapse_app_service_config_files_final holds the final list of config files to pass to the container.
# You're not meant to override this variable.
# If you'd like to inject your own arguments, see `matrix_synapse_app_service_config_files`.
matrix_synapse_app_service_config_files_final: "{{ matrix_synapse_app_service_config_files + matrix_synapse_app_service_runtime_injected_config_files }}"
# This is set dynamically during execution depending on whether # This is set dynamically during execution depending on whether
# any password providers have been enabled or not. # any password providers have been enabled or not.
matrix_synapse_password_providers_enabled: false matrix_synapse_password_providers_enabled: false

View file

@ -1647,7 +1647,7 @@ room_prejoin_state:
# A list of application service config files to use # A list of application service config files to use
# #
app_service_config_files: {{ matrix_synapse_app_service_config_files|to_json }} app_service_config_files: {{ matrix_synapse_app_service_config_files_final|to_json }}
# Uncomment to enable tracking of application service IP addresses. Implicitly # Uncomment to enable tracking of application service IP addresses. Implicitly
# enables MAU tracking for application service users. # enables MAU tracking for application service users.

View file

@ -39,7 +39,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name {{ matrix_synapse_wor
{% for volume in matrix_synapse_container_additional_volumes %} {% for volume in matrix_synapse_container_additional_volumes %}
-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \ -v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
{% endfor %} {% endfor %}
{% for arg in matrix_synapse_container_extra_arguments %} {% for arg in matrix_synapse_container_arguments %}
{{ arg }} \ {{ arg }} \
{% endfor %} {% endfor %}
{{ matrix_synapse_docker_image }} \ {{ matrix_synapse_docker_image }} \

View file

@ -57,7 +57,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-synapse \
{% for volume in matrix_synapse_container_additional_volumes %} {% for volume in matrix_synapse_container_additional_volumes %}
-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \ -v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
{% endfor %} {% endfor %}
{% for arg in matrix_synapse_container_extra_arguments %} {% for arg in matrix_synapse_container_arguments %}
{{ arg }} \ {{ arg }} \
{% endfor %} {% endfor %}
{{ matrix_synapse_docker_image }} \ {{ matrix_synapse_docker_image }} \