summary refs log tree commit diff
path: root/synctl
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-11-17 16:59:24 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-11-17 16:59:24 +0000
commit31a049eb692d37387a2db972da754f7ec56218c7 (patch)
tree9e5f47abad904d30c08d2f340b543a631e436894 /synctl
parentInclude room membership in room initialSync (diff)
parentSYN-148: Add the alias after creating the room (diff)
downloadsynapse-31a049eb692d37387a2db972da754f7ec56218c7.tar.xz
Merge branch 'develop' into room-initial-sync
Conflicts:
	synapse/handlers/message.py
Diffstat (limited to 'synctl')
l---------[-rwxr-xr-x]synctl36
1 files changed, 1 insertions, 35 deletions
diff --git a/synctl b/synctl
index c227a9e1e4..1bdceda20a 100755..120000
--- a/synctl
+++ b/synctl
@@ -1,35 +1 @@
-#!/bin/bash
-
-SYNAPSE="python -m synapse.app.homeserver"
-
-CONFIGFILE="homeserver.yaml"
-PIDFILE="homeserver.pid"
-
-GREEN=$'\e[1;32m'
-NORMAL=$'\e[m'
-
-set -e
-
-case "$1" in
-  start)
-    if [ ! -f "$CONFIGFILE" ]; then
-      echo "No config file found"
-      echo "To generate a config file, run '$SYNAPSE -c $CONFIGFILE --generate-config --server-name=<server name>'"
-      exit 1
-    fi
-
-    echo -n "Starting ..."
-    $SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE"
-    echo "${GREEN}started${NORMAL}"
-    ;;
-  stop)
-    echo -n "Stopping ..."
-    test -f $PIDFILE && kill `cat $PIDFILE` && echo "${GREEN}stopped${NORMAL}"
-    ;;
-  restart)
-    $0 stop && $0 start
-    ;;
-  *)
-    echo "Usage: $0 [start|stop|restart]" >&2
-    exit 1
-esac
+./synapse/app/synctl.py
\ No newline at end of file