diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:36 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:50 +0100 |
| commit | 984e207b5982df26bec37223cd07b4044dcacdd2 (patch) | |
| tree | 9b7cd2052ab91b4365bb43f46d2509b389bf1bab /synctl | |
| parent | Merge branch 'develop' into server2server_signing (diff) | |
| parent | remove wishlist in favour of jira (diff) | |
| download | synapse-984e207b5982df26bec37223cd07b4044dcacdd2.tar.xz | |
Merge branch develop into server2server_signing
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'synctl')
| -rwxr-xr-x | synctl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synctl b/synctl index 0f83e9cb1f..c227a9e1e4 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 --server-name=<server name>'" exit 1 fi |