Просмотр исходного кода

Suppress output for ExecStartPre/ExecStop commands

This brings matrix-dendrite.service in line with all the other services.
pull/1520/head
Slavi Pantaleev 4 лет назад
Родитель
Сommit
61c0930325
1 измененных файлов: 5 добавлений и 5 удалений
  1. +5
    -5
      roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2

+ 5
- 5
roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2 Просмотреть файл

@@ -13,8 +13,8 @@ DefaultDependencies=no
[Service] [Service]
Type=simple Type=simple
Environment="HOME={{ matrix_systemd_unit_home_path }}" Environment="HOME={{ matrix_systemd_unit_home_path }}"
ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-dendrite
ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-dendrite
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-dendrite 2>/dev/null'
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-dendrite 2>/dev/null'


{% if 'matrix-postgres.service' in matrix_dendrite_systemd_required_services_list %} {% if 'matrix-postgres.service' in matrix_dendrite_systemd_required_services_list %}
# Dendrite is too quick to start in relation to its matrix-postgres dependency. # Dendrite is too quick to start in relation to its matrix-postgres dependency.
@@ -53,9 +53,9 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-dendrite \
{% endif %} {% endif %}
{{ matrix_dendrite_process_extra_arguments|join(' ') }} {{ matrix_dendrite_process_extra_arguments|join(' ') }}


ExecStop=-{{ matrix_host_command_docker }} kill matrix-dendrite
ExecStop=-{{ matrix_host_command_docker }} rm matrix-dendrite
ExecReload={{ matrix_host_command_docker }} exec matrix-dendrite kill -HUP 1
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-dendrite 2>/dev/null'
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-dendrite 2>/dev/null'
ExecReload={{ matrix_host_command_docker }} exec matrix-dendrite /bin/sh -c 'kill -HUP 1'
Restart=always Restart=always
RestartSec=30 RestartSec=30
SyslogIdentifier=matrix-dendrite SyslogIdentifier=matrix-dendrite


Загрузка…
Отмена
Сохранить