diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-12 10:37:00 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-12 10:37:59 +0000 |
| commit | dfc846a316a92a750133ed04f3625da70f7944d7 (patch) | |
| tree | 8609e115c50a993307141254dba80a1365d8e011 | |
| parent | Merge pull request #4619 from matrix-org/rav/remove_docker_no_tls_hacks (diff) | |
| download | synapse-dfc846a316a92a750133ed04f3625da70f7944d7.tar.xz | |
fix self-signed cert notice from generate-config
fixes #4620
| -rw-r--r-- | changelog.d/4625.bugfix | 1 | ||||
| -rw-r--r-- | synapse/config/_base.py | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/changelog.d/4625.bugfix b/changelog.d/4625.bugfix new file mode 100644 index 0000000000..3dc0ecf24c --- /dev/null +++ b/changelog.d/4625.bugfix @@ -0,0 +1 @@ +fix self-signed cert notice from generate-config. 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( |