diff options
author | David Baker <dbkr@matrix.org> | 2014-10-02 14:11:17 +0100 |
---|---|---|
committer | David Baker <dbkr@matrix.org> | 2014-10-02 14:11:17 +0100 |
commit | 9435830351850deb1bd8aced59ba68d1823425d9 (patch) | |
tree | ab99c0e6bf5dc87a376abd644458d9ceb6ab2dc2 /synapse/config | |
parent | Split PlainHttpClient into separate clients for talking to Identity servers a... (diff) | |
parent | Fix ncorrect ports in documentation and add notes on how generate-config also... (diff) | |
download | synapse-9435830351850deb1bd8aced59ba68d1823425d9.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/_base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 809f9c922b..b3aeff327c 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -123,7 +123,8 @@ 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']) + print "A config file has been generated in %s for server name '%s') with corresponding SSL keys and self-signed certificates. Please review this file and customise it to your needs." % (config_args.config_path, config['server_name']) + print "If this server name is incorrect, you will need to regenerate the SSL certificates" sys.exit(0) return cls(args) |