Merge pull request #524 from cnvandijk/fix-executable-path
Remove hardcoded paths to commands on the host machine
This commit is contained in:
@ -11,16 +11,16 @@ Wants={{ service }}
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStartPre=-/usr/bin/docker kill matrix-synapse
|
||||
ExecStartPre=-/usr/bin/docker rm matrix-synapse
|
||||
ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-synapse
|
||||
ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-synapse
|
||||
{% 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=/bin/sleep 3
|
||||
ExecStartPre={{ matrix_host_command_sleep }} 3
|
||||
{% endif %}
|
||||
|
||||
ExecStart=/usr/bin/docker run --rm --name matrix-synapse \
|
||||
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-synapse \
|
||||
--log-driver=none \
|
||||
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
||||
--cap-drop=ALL \
|
||||
@ -54,9 +54,9 @@ ExecStart=/usr/bin/docker run --rm --name matrix-synapse \
|
||||
{{ matrix_synapse_docker_image }} \
|
||||
-m synapse.app.homeserver -c /data/homeserver.yaml
|
||||
|
||||
ExecStop=-/usr/bin/docker kill matrix-synapse
|
||||
ExecStop=-/usr/bin/docker rm matrix-synapse
|
||||
ExecReload=/usr/bin/docker exec matrix-synapse kill -HUP 1
|
||||
ExecStop=-{{ matrix_host_command_docker }} kill matrix-synapse
|
||||
ExecStop=-{{ matrix_host_command_docker }} rm matrix-synapse
|
||||
ExecReload={{ matrix_host_command_docker }} exec matrix-synapse kill -HUP 1
|
||||
Restart=always
|
||||
RestartSec=30
|
||||
SyslogIdentifier=matrix-synapse
|
||||
|
Reference in New Issue
Block a user