Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #250 from matrix-org/erikj/generated_directory

Browse Source 
Add config option to specify where generated files should be dumped
This commit is contained in:
Erik Johnston 2015-08-25 17:40:19 +01:00
commit 0de2aad061
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
synapse/config/_base.py
View File

@ -144,6 +144,13 @@ class Config(object):
action="store_true", action="store_true",
help="Generate any missing key files then exit" help="Generate any missing key files then exit"
) )
config_parser.add_argument(
"--keys-directory",
metavar="DIRECTORY",
help="Used with 'generate-*' options to specify where files such as"
" certs and signing keys should be stored in, unless explicitly"
" specified in the config."
)
config_parser.add_argument( config_parser.add_argument(
"-H", "--server-name", "-H", "--server-name",
help="The server name to generate a config file for" help="The server name to generate a config file for"
@ -188,7 +195,10 @@ 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):
config_dir_path = os.path.dirname(config_path) 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) config_dir_path = os.path.abspath(config_dir_path)
server_name = config_args.server_name server_name = config_args.server_name
@ -237,7 +247,10 @@ class Config(object):
" -c CONFIG-FILE\"" " -c CONFIG-FILE\""
) )
config_dir_path = os.path.dirname(config_args.config_path[-1]) 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) config_dir_path = os.path.abspath(config_dir_path)
specified_config = {} specified_config = {}