summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-02 10:46:41 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-02 10:46:41 +0100
commit099083ea6b929eb1c14d478134c5b0a0e16415ba (patch)
tree2b70b2ae685d42434262ed92274211a045e9cd61 /synapse
parentMake instructions synctl gives for generateing a config file actuall generate... (diff)
parentUpdate README setup instructions to be correct. Make synapse spit out explana... (diff)
downloadsynapse-099083ea6b929eb1c14d478134c5b0a0e16415ba.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/_base.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 35bcece2c0..809f9c922b 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -123,6 +123,7 @@ class Config(object):
                 #   style mode markers into the file, to hint to people that
                 #   this is a YAML file.
                 yaml.dump(config, config_file, default_flow_style=False)
+            print "A config file has been generated in %s (your server name is '%s'). Please review this file and customise it to your needs." % (config_args.config_path, config['server_name'])
             sys.exit(0)
 
         return cls(args)