mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-06 22:11:52 +00:00
s/--generated-directory/--keys-directory/
This commit is contained in:
parent
af7c1397d1
commit
82145912c3
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user