Don't autogen config in synctl for the same reasons we don't turn of --generate-config by default on the homeserver - it is liable to confuse people who have moved the config file or have chosen a non standard location.

Also, don't override log file location.
This commit is contained in:
Erik Johnston 2014-09-08 22:48:40 +01:00
parent e062f2dfa8
commit 91b370650a
1 changed files with 2 additions and 6 deletions

8
synctl
View File

@ -4,7 +4,6 @@ SYNAPSE="synapse/app/homeserver.py"
CONFIGFILE="homeserver.yaml" CONFIGFILE="homeserver.yaml"
PIDFILE="homeserver.pid" PIDFILE="homeserver.pid"
LOGFILE="homeserver.log"
GREEN=$'\e[1;32m' GREEN=$'\e[1;32m'
NORMAL=$'\e[m' NORMAL=$'\e[m'
@ -14,15 +13,12 @@ set -e
case "$1" in case "$1" in
start) start)
if [ ! -f "$CONFIGFILE" ]; then if [ ! -f "$CONFIGFILE" ]; then
echo "No config file found - generating a default one..." echo "No config file found"
$SYNAPSE -c "$CONFIGFILE" --generate-config
echo "Wrote $CONFIGFILE"
echo "You must now edit this file before continuing"
exit 1 exit 1
fi fi
echo -n "Starting ..." echo -n "Starting ..."
$SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE" --log-file "$LOGFILE" $SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE"
echo "${GREEN}started${NORMAL}" echo "${GREEN}started${NORMAL}"
;; ;;
stop) stop)