summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-10-02 09:55:26 +0100
committerDavid Baker <dbkr@matrix.org>2014-10-02 09:55:26 +0100
commita0b1b34c71e46304f7024f0570db92f4577303b5 (patch)
tree56373ffd400cacbefbe2aeffbc3cffb62da49b66
parentAdded a TODO-doc marker about the presence timing system (diff)
downloadsynapse-a0b1b34c71e46304f7024f0570db92f4577303b5.tar.xz
Make instructions synctl gives for generateing a config file actuall generate a config file. Also, make synctil run synapse correctly by invoking a module such that the path is correct to pull in other bits from the working directory rather than requiring them to be on the PYTHONPATH (which would lead to people being very confused when they edit source in the working directory and their changes do not take effect).
-rwxr-xr-xsynctl4
1 files changed, 2 insertions, 2 deletions
diff --git a/synctl b/synctl
index 0f83e9cb1f..7523fd3dbc 100755
--- a/synctl
+++ b/synctl
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SYNAPSE="synapse/app/homeserver.py"
+SYNAPSE="python -m synapse.app.homeserver"
 
 CONFIGFILE="homeserver.yaml"
 PIDFILE="homeserver.pid"
@@ -14,7 +14,7 @@ case "$1" in
   start)
     if [ ! -f "$CONFIGFILE" ]; then
       echo "No config file found"
-      echo "To generate a config file, run 'python --generate-config'"
+      echo "To generate a config file, run '$SYNAPSE -c $CONFIGFILE --generate-config'"
       exit 1
     fi