summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-25 17:31:22 +0100
committerErik Johnston <erik@matrix.org>2015-08-25 17:31:22 +0100
commit82145912c330528ec85276467f4ea38362e796b8 (patch)
tree6751e27e91ccfa78af77f1f64f6378830d12e12b
parentAdd config option to specify where generated files should be dumped (diff)
downloadsynapse-82145912c330528ec85276467f4ea38362e796b8.tar.xz
s/--generated-directory/--keys-directory/
Diffstat (limited to '')
-rw-r--r--synapse/config/_base.py14
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)