From ca1a6e8799ad145a78a1409a8ecde905436108d9 Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Wed, 24 Aug 2022 04:16:27 +0000 Subject: [PATCH] appservice: use the new vars --- roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2 | 2 +- .../templates/dendrite/systemd/matrix-dendrite.service.j2 | 2 +- roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 | 2 +- .../templates/synapse/systemd/matrix-synapse-worker.service.j2 | 2 +- .../templates/synapse/systemd/matrix-synapse.service.j2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2 b/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2 index 62f8caba7..f34ae8de2 100644 --- a/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2 +++ b/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2 @@ -145,7 +145,7 @@ app_service_api: disable_tls_validation: {{ matrix_dendrite_disable_tls_validation|to_json }} # Appservice configuration files to load into this homeserver. - config_files: {{ matrix_dendrite_app_service_config_files|to_json }} + config_files: {{ matrix_dendrite_config_files|to_json }} # Configuration for the Client API. client_api: diff --git a/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2 b/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2 index 0613f443f..69eca497c 100644 --- a/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2 +++ b/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2 @@ -41,7 +41,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-dendrite \ {% for volume in matrix_dendrite_container_additional_volumes %} -v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \ {% endfor %} - {% for arg in matrix_dendrite_container_extra_arguments %} + {% for arg in matrix_dendrite_container_arguments %} {{ arg }} \ {% endfor %} {{ matrix_dendrite_docker_image }} \ diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 index cb9b85851..915d41db9 100644 --- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 +++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 @@ -1647,7 +1647,7 @@ room_prejoin_state: # 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_config_files|to_json }} # Uncomment to enable tracking of application service IP addresses. Implicitly # enables MAU tracking for application service users. diff --git a/roles/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2 b/roles/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2 index 43dc42d1f..c7ef13fa9 100644 --- a/roles/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2 +++ b/roles/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2 @@ -39,7 +39,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name {{ matrix_synapse_wor {% for volume in matrix_synapse_container_additional_volumes %} -v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \ {% endfor %} - {% for arg in matrix_synapse_container_extra_arguments %} + {% for arg in matrix_synapse_container_arguments %} {{ arg }} \ {% endfor %} {{ matrix_synapse_docker_image }} \ diff --git a/roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2 b/roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2 index 2b59748fd..027114fb3 100644 --- a/roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2 +++ b/roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2 @@ -57,7 +57,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-synapse \ {% for volume in matrix_synapse_container_additional_volumes %} -v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \ {% endfor %} - {% for arg in matrix_synapse_container_extra_arguments %} + {% for arg in matrix_synapse_container_arguments %} {{ arg }} \ {% endfor %} {{ matrix_synapse_docker_image }} \