From 91b370650ab288de6cf22765b43d9ffb7907beb2 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 8 Sep 2014 22:48:40 +0100
Subject: 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.
---
 synctl | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'synctl')

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