mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-11-07 03:07:33 +01:00
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.
38 lines
1.4 KiB
Django/Jinja
38 lines
1.4 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix mailer
|
|
After=docker.service
|
|
Requires=docker.service
|
|
DefaultDependencies=no
|
|
|
|
[Service]
|
|
Type=simple
|
|
Environment="HOME={{ matrix_systemd_unit_home_path }}"
|
|
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-mailer 2>/dev/null'
|
|
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-mailer 2>/dev/null'
|
|
|
|
# --hostname gives us a friendlier hostname than the default.
|
|
# The real hostname is passed via a `HOSTNAME` environment variable though.
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-mailer \
|
|
--log-driver=none \
|
|
--user={{ matrix_mailer_container_user_uid }}:{{ matrix_mailer_container_user_gid }} \
|
|
--cap-drop=ALL \
|
|
--read-only \
|
|
--tmpfs=/var/spool/exim:rw,noexec,nosuid,size=100m \
|
|
--network={{ matrix_docker_network }} \
|
|
--env-file={{ matrix_mailer_base_path }}/env-mailer \
|
|
--hostname=matrix-mailer \
|
|
{% for arg in matrix_mailer_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_mailer_docker_image }}
|
|
|
|
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-mailer 2>/dev/null'
|
|
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-mailer 2>/dev/null'
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-mailer
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|