Quellcode durchsuchen

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

Fix Dendrite extra arguments getting lost
pull/2000/head
Slavi Pantaleev vor 3 Jahren
committed by GitHub
Ursprung
Commit
a3e89970be
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
  1. +1
    -1
      roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2

+ 1
- 1
roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2 Datei anzeigen

@@ -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'


Laden…
Abbrechen
Speichern