finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove matrix_s3 references from matrix-dendrite role

Browse Source 
All the `matrix_s3_*` stuff happens in the `matrix-synapse` role.

If we are to have such S3 support for Dendrite, we should probably
extract it out of the `matrix-synapse` role (into a `matrix-s3` role or
`matrix-goofys`, etc.) and wire `matrix-dendrite` accordingly.

This may or may not be done in the future though. For now, I'm
cleaning things up in the `matrix-dendrite` role.
This commit is contained in:
Slavi Pantaleev
2021-12-18 13:37:43 +02:00
parent 3b9d5b13e9
commit 9f6e8f5eaf
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2
View File

@ -15,12 +15,6 @@ Type=simple
Environment="HOME={{ matrix_systemd_unit_home_path }}"
ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-dendrite
ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-dendrite
{% if matrix_s3_media_store_enabled %}
# Allow for some time before starting, so that media store can mount.
# Mounting can happen later too, but if we start writing,
# we'd write files to the local filesystem and fusermount will complain.
ExecStartPre={{ matrix_host_command_sleep }} 3
{% endif %}
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-dendrite \
--log-driver=none \