86c36523df
Revertsb1b4ba501f,90c9801c56,a3c84f78ca, .. I haven't really traced it (yet), but on some servers, I'm observing `ansible-playbook ... --tags=start` completing very slowly, waiting to stop services. I can't reproduce this on all Matrix servers I manage. I suspect that either the systemd version is to blame or that some specific service is not responding well to some `docker kill/rm` command. `ExecStop` seems to work great in all cases and it's what we've been using for a very long time, so I'm reverting to that.
41 lines
1.6 KiB
Django/Jinja
41 lines
1.6 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix Cinny Client
|
|
{% for service in matrix_client_cinny_systemd_required_services_list %}
|
|
Requires={{ service }}
|
|
After={{ service }}
|
|
{% endfor %}
|
|
DefaultDependencies=no
|
|
|
|
[Service]
|
|
Type=simple
|
|
Environment="HOME={{ matrix_systemd_unit_home_path }}"
|
|
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-client-cinny 2>/dev/null'
|
|
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-client-cinny 2>/dev/null'
|
|
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-client-cinny \
|
|
--log-driver=none \
|
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
|
--cap-drop=ALL \
|
|
--read-only \
|
|
--network={{ matrix_docker_network }} \
|
|
{% if matrix_client_cinny_container_http_host_bind_port %}
|
|
-p {{ matrix_client_cinny_container_http_host_bind_port }}:8080 \
|
|
{% endif %}
|
|
--tmpfs=/tmp:rw,noexec,nosuid,size=10m \
|
|
--mount type=bind,src={{ matrix_client_cinny_data_path }}/nginx.conf,dst=/etc/nginx/nginx.conf,ro \
|
|
--mount type=bind,src={{ matrix_client_cinny_data_path }}/config.json,dst=/app/config.json,ro \
|
|
{% for arg in matrix_client_cinny_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_client_cinny_docker_image }}
|
|
|
|
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-client-cinny 2>/dev/null'
|
|
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-client-cinny 2>/dev/null'
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-client-cinny
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|