ansol/matrix-docker-ansible-deploy
7
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-22 20:45:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3193 from meenzen/fix/conduit-config-override

Browse Source 
fix: actually allow overriding the conduit config template
This commit is contained in:
Slavi Pantaleev 2024-02-19 16:41:55 +02:00 committed by GitHub
commit 2cd3d4eedb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/custom/matrix-conduit/defaults/main.yml
View File

@ -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 # 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/<host>/`) # the original files into your inventory (e.g. in `inventory/host_vars/<host>/`)
# and then change the specific host's `vars.yaml` file like this: # and then change the specific host's `vars.yaml` file like this:
# matrix_conduit_template_conduit_config: "{{ playbook_dir }}/inventory/host_vars/<host>/conduit.yaml.j2" # matrix_conduit_template_conduit_config: "{{ playbook_dir }}/inventory/host_vars/<host>/conduit.toml.j2"
matrix_conduit_template_conduit_config: "{{ role_path }}/templates/conduit/conduit.toml.j2" matrix_conduit_template_conduit_config: "{{ role_path }}/templates/conduit/conduit.toml.j2"
# Max size for uploads, in bytes # Max size for uploads, in bytes

2
roles/custom/matrix-conduit/tasks/setup_install.yml
View File

@ -18,7 +18,7 @@
- name: Ensure Conduit configuration installed - name: Ensure Conduit configuration installed
ansible.builtin.template: ansible.builtin.template:
src: "{{ role_path }}/templates/conduit.toml.j2" src: "{{ matrix_conduit_template_conduit_config }}"
dest: "{{ matrix_conduit_config_path }}/conduit.toml" dest: "{{ matrix_conduit_config_path }}/conduit.toml"
mode: 0644 mode: 0644
owner: "{{ matrix_user_username }}" owner: "{{ matrix_user_username }}"