Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/--generated-directory/--keys-directory/

This commit is contained in:
Erik Johnston 2015-08-25 17:31:22 +01:00
parent af7c1397d1
commit 82145912c3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
synapse/config/_base.py
View File

@ -145,10 +145,10 @@ class Config(object):
help="Generate any missing key files then exit" help="Generate any missing key files then exit"
) )
config_parser.add_argument( config_parser.add_argument(
"--generated-directory", "--keys-directory",
metavar="DIRECTORY", metavar="DIRECTORY",
help="Used with 'generate-*' options to specify where generated" help="Used with 'generate-*' options to specify where files such as"
" files (such as certs and signing keys) should be stored." " certs and signing keys should be stored in."
) )
config_parser.add_argument( config_parser.add_argument(
"-H", "--server-name", "-H", "--server-name",
@ -184,8 +184,8 @@ class Config(object):
) )
(config_path,) = config_files (config_path,) = config_files
if not os.path.exists(config_path): if not os.path.exists(config_path):
if config_args.generated_directory: if config_args.keys_directory:
config_dir_path = config_args.generated_directory config_dir_path = config_args.keys_directory
else: else:
config_dir_path = os.path.dirname(config_path) config_dir_path = os.path.dirname(config_path)
config_dir_path = os.path.abspath(config_dir_path) config_dir_path = os.path.abspath(config_dir_path)
@ -236,8 +236,8 @@ class Config(object):
" -c CONFIG-FILE\"" " -c CONFIG-FILE\""
) )
if config_args.generated_directory: if config_args.keys_directory:
config_dir_path = config_args.generated_directory config_dir_path = config_args.keys_directory
else: else:
config_dir_path = os.path.dirname(config_args.config_path[-1]) config_dir_path = os.path.dirname(config_args.config_path[-1])
config_dir_path = os.path.abspath(config_dir_path) config_dir_path = os.path.abspath(config_dir_path)