summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorrnbdsh <vogl91@gmail.com>2017-09-24 04:26:23 +0200
committerGitHub <noreply@github.com>2017-09-24 04:26:23 +0200
commit68f737702b5ce90425cbb77a3ce175225bf72086 (patch)
treec5e125070dc61d4f4389e732a942bf46cab25a66 /contrib
parentExclude the github issue template from our sdist (#2440) (diff)
downloadsynapse-68f737702b5ce90425cbb77a3ce175225bf72086.tar.xz
Remove non-existing files, add stop, use synctl
Non-existing files, when running the suggested from https://github.com/matrix-org/synapse#configuring-synapse
/etc/synapse/log_config.yaml so the --log-config leads to an error
/etc/sysconfig/synapse The environment-file or even the /etc/sysconfig does not exist in arch linux

Also instead of calling python2 we use synctl, as this seems to be the proper way to start it, and it gives us a more useful error in the systemctl status. And we now allow stop (and therefore restart).
Diffstat (limited to 'contrib')
-rw-r--r--contrib/systemd/synapse.service4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/systemd/synapse.service b/contrib/systemd/synapse.service
index 92d94b9d58..b71be582c6 100644
--- a/contrib/systemd/synapse.service
+++ b/contrib/systemd/synapse.service
@@ -9,9 +9,9 @@ Description=Synapse Matrix homeserver
 Type=simple
 User=synapse
 Group=synapse
-EnvironmentFile=-/etc/sysconfig/synapse
 WorkingDirectory=/var/lib/synapse
-ExecStart=/usr/bin/python2.7 -m synapse.app.homeserver --config-path=/etc/synapse/homeserver.yaml --log-config=/etc/synapse/log_config.yaml
+ExecStart=/usr/bin/synctl start /etc/synapse/homeserver.yaml
+ExecStop=/usr/bin/synctl stop /etc/synapse/homeserver.yaml
 
 [Install]
 WantedBy=multi-user.target