mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-27 19:38:29 +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.
40 lines
1.6 KiB
Django/Jinja
40 lines
1.6 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix Goofys media store
|
|
After=docker.service
|
|
Requires=docker.service
|
|
DefaultDependencies=no
|
|
|
|
[Service]
|
|
Type=simple
|
|
Environment="HOME={{ matrix_systemd_unit_home_path }}"
|
|
ExecStartPre=-{{ matrix_host_command_docker }} kill %n
|
|
ExecStartPre=-{{ matrix_host_command_docker }} rm %n
|
|
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name %n \
|
|
--log-driver=none \
|
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
|
--mount type=bind,src=/etc/passwd,dst=/etc/passwd,ro \
|
|
--mount type=bind,src=/etc/group,dst=/etc/group,ro \
|
|
--mount type=bind,src={{ matrix_s3_media_store_path }},dst=/s3,bind-propagation=shared \
|
|
--security-opt apparmor:unconfined \
|
|
--cap-add mknod \
|
|
--cap-add sys_admin \
|
|
--device=/dev/fuse \
|
|
--env-file={{ matrix_synapse_config_dir_path }}/env-goofys \
|
|
--entrypoint /bin/sh \
|
|
{{ matrix_s3_goofys_docker_image }} \
|
|
-c 'goofys -f{% if not matrix_s3_media_store_custom_endpoint_enabled %} --storage-class=STANDARD_IA{% endif %}{% if matrix_s3_media_store_custom_endpoint_enabled %} --endpoint={{ matrix_s3_media_store_custom_endpoint }}{% endif %} --region {{ matrix_s3_media_store_region }} --stat-cache-ttl 60m0s --type-cache-ttl 60m0s --dir-mode 0700 --file-mode 0700 {{ matrix_s3_media_store_bucket_name }} /s3'
|
|
|
|
TimeoutStartSec=5min
|
|
ExecStop=-{{ matrix_host_command_docker }} stop %n
|
|
ExecStop=-{{ matrix_host_command_docker }} kill %n
|
|
ExecStop=-{{ matrix_host_command_docker }} rm %n
|
|
ExecStop=-{{ matrix_host_command_fusermount }} -u {{ matrix_s3_media_store_path }}
|
|
Restart=always
|
|
RestartSec=5
|
|
SyslogIdentifier=matrix-goofys
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|