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

Merge pull request #1999 from cvwright/dendrite-extra-args

Browse Source 
Fix Dendrite extra arguments getting lost
This commit is contained in:
Slavi Pantaleev 2022-08-04 06:47:26 +03:00 committed by GitHub
commit a3e89970be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2
View File

@ -46,13 +46,13 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-dendrite \
{% endfor %} {% endfor %}
{{ matrix_dendrite_docker_image }} \ {{ matrix_dendrite_docker_image }} \
-config /data/dendrite.yaml \ -config /data/dendrite.yaml \
{{ matrix_dendrite_process_extra_arguments|join(' ') }} \
{% if matrix_dendrite_http_bind_address %} {% if matrix_dendrite_http_bind_address %}
-http-bind-address {{ matrix_dendrite_http_bind_address }} -http-bind-address {{ matrix_dendrite_http_bind_address }}
{% endif %} {% endif %}
{% if matrix_dendrite_https_bind_address %} {% if matrix_dendrite_https_bind_address %}
-https-bind-address {{ matrix_dendrite_https_bind_address }} -https-bind-address {{ matrix_dendrite_https_bind_address }}
{% endif %} {% endif %}
{{ matrix_dendrite_process_extra_arguments|join(' ') }}
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-dendrite 2>/dev/null || true' ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-dendrite 2>/dev/null || true'
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-dendrite 2>/dev/null || true' ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-dendrite 2>/dev/null || true'