From bb59e82bcadafba8d5262e976e11df7e89dd4885 Mon Sep 17 00:00:00 2001 From: Samuel Meenzen Date: Mon, 19 Feb 2024 15:14:36 +0100 Subject: [PATCH] fix: actually allow overriding the conduit config template --- roles/custom/matrix-conduit/defaults/main.yml | 2 +- roles/custom/matrix-conduit/tasks/setup_install.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-conduit/defaults/main.yml b/roles/custom/matrix-conduit/defaults/main.yml index 37d83fd10..3bccf1078 100644 --- a/roles/custom/matrix-conduit/defaults/main.yml +++ b/roles/custom/matrix-conduit/defaults/main.yml @@ -114,7 +114,7 @@ matrix_conduit_container_extra_arguments: [] # If you'd like to have your own different configuration, feel free to copy and paste # the original files into your inventory (e.g. in `inventory/host_vars//`) # and then change the specific host's `vars.yaml` file like this: -# matrix_conduit_template_conduit_config: "{{ playbook_dir }}/inventory/host_vars//conduit.yaml.j2" +# matrix_conduit_template_conduit_config: "{{ playbook_dir }}/inventory/host_vars//conduit.toml.j2" matrix_conduit_template_conduit_config: "{{ role_path }}/templates/conduit/conduit.toml.j2" # Max size for uploads, in bytes diff --git a/roles/custom/matrix-conduit/tasks/setup_install.yml b/roles/custom/matrix-conduit/tasks/setup_install.yml index 409f2e80c..295b5c4f2 100644 --- a/roles/custom/matrix-conduit/tasks/setup_install.yml +++ b/roles/custom/matrix-conduit/tasks/setup_install.yml @@ -18,7 +18,7 @@ - name: Ensure Conduit configuration installed ansible.builtin.template: - src: "{{ role_path }}/templates/conduit.toml.j2" + src: "{{ matrix_conduit_template_conduit_config }}" dest: "{{ matrix_conduit_config_path }}/conduit.toml" mode: 0644 owner: "{{ matrix_user_username }}"