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.
44 lines
1.7 KiB
Django/Jinja
44 lines
1.7 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix Mx Puppet Skype bridge
|
|
{% for service in matrix_mx_puppet_skype_systemd_required_services_list %}
|
|
Requires={{ service }}
|
|
After={{ service }}
|
|
{% endfor %}
|
|
{% for service in matrix_mx_puppet_skype_systemd_wanted_services_list %}
|
|
Wants={{ 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-mx-puppet-skype 2>/dev/null'
|
|
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-mx-puppet-skype 2>/dev/null'
|
|
|
|
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
|
|
ExecStartPre={{ matrix_host_command_sleep }} 5
|
|
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-mx-puppet-skype \
|
|
--log-driver=none \
|
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
|
--cap-drop=ALL \
|
|
--network={{ matrix_docker_network }} \
|
|
-e CONFIG_PATH=/config/config.yaml \
|
|
-e REGISTRATION_PATH=/config/registration.yaml \
|
|
-v {{ matrix_mx_puppet_skype_config_path }}:/config:z \
|
|
-v {{ matrix_mx_puppet_skype_data_path }}:/data:z \
|
|
{% for arg in matrix_mx_puppet_skype_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_mx_puppet_skype_docker_image }}
|
|
|
|
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-mx-puppet-skype 2>/dev/null'
|
|
ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-mx-puppet-skype 2>/dev/null'
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-mx-puppet-skype
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|