diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-12 11:24:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 11:24:45 +0000 |
| commit | 3c03c3788324e9d3e6e456a744913a4aabc2971c (patch) | |
| tree | 79601597ccb1bd63cfe7fb8743052502d8662c25 /synapse/config | |
| parent | README updates (#4621) (diff) | |
| parent | fix self-signed cert notice from generate-config (diff) | |
| download | synapse-3c03c3788324e9d3e6e456a744913a4aabc2971c.tar.xz | |
Merge pull request #4625 from matrix-org/rav/fix_generate_config_warnings
fix self-signed cert notice from generate-config
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/_base.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 5858fb92b4..5aec43b702 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -257,7 +257,7 @@ class Config(object): "--keys-directory", metavar="DIRECTORY", help="Used with 'generate-*' options to specify where files such as" - " certs and signing keys should be stored in, unless explicitly" + " signing keys should be stored, unless explicitly" " specified in the config.", ) config_parser.add_argument( @@ -313,16 +313,11 @@ class Config(object): print( ( "A config file has been generated in %r for server name" - " %r with corresponding SSL keys and self-signed" - " certificates. Please review this file and customise it" + " %r. Please review this file and customise it" " to your needs." ) % (config_path, server_name) ) - print( - "If this server name is incorrect, you will need to" - " regenerate the SSL certificates" - ) return else: print( |