OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4625 from matrix-org/rav/fix_generate_config_warnings 

fix self-signed cert notice from generate-config
pull/4635/head
Erik Johnston 2019-02-12 11:24:45 +00:00 committed by GitHub
parent 2418b91bb7 dfc846a316
commit 3c03c37883
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4625.bugfix Normal file
View File

@ -0,0 +1 @@
fix self-signed cert notice from generate-config.

9
synapse/config/_base.py
View File

@ -257,7 +257,7 @@ class Config(object):
"--keys-directory", "--keys-directory",
metavar="DIRECTORY", metavar="DIRECTORY",
help="Used with 'generate-*' options to specify where files such as" 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.", " specified in the config.",
) )
config_parser.add_argument( config_parser.add_argument(
@ -313,16 +313,11 @@ class Config(object):
print( print(
( (
"A config file has been generated in %r for server name" "A config file has been generated in %r for server name"
" %r with corresponding SSL keys and self-signed" " %r. Please review this file and customise it"
" certificates. Please review this file and customise it"
" to your needs." " to your needs."
) )
% (config_path, server_name) % (config_path, server_name)
) )
print(
"If this server name is incorrect, you will need to"
" regenerate the SSL certificates"
)
return return
else: else:
print( print(