1 files changed, 7 insertions, 7 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 1bc2e61ee6..93433c0756 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -145,10 +145,10 @@ class Config(object):
help="Generate any missing key files then exit"
)
config_parser.add_argument(
- "--generated-directory",
+ "--keys-directory",
metavar="DIRECTORY",
- help="Used with 'generate-*' options to specify where generated"
- " files (such as certs and signing keys) should be stored."
+ help="Used with 'generate-*' options to specify where files such as"
+ " certs and signing keys should be stored in."
)
config_parser.add_argument(
"-H", "--server-name",
@@ -184,8 +184,8 @@ class Config(object):
)
(config_path,) = config_files
if not os.path.exists(config_path):
- if config_args.generated_directory:
- config_dir_path = config_args.generated_directory
+ if config_args.keys_directory:
+ config_dir_path = config_args.keys_directory
else:
config_dir_path = os.path.dirname(config_path)
config_dir_path = os.path.abspath(config_dir_path)
@@ -236,8 +236,8 @@ class Config(object):
" -c CONFIG-FILE\""
)
- if config_args.generated_directory:
- config_dir_path = config_args.generated_directory
+ if config_args.keys_directory:
+ config_dir_path = config_args.keys_directory
else:
config_dir_path = os.path.dirname(config_args.config_path[-1])
config_dir_path = os.path.abspath(config_dir_path)
|
