diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-23 17:27:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-23 17:27:49 +0000 |
| commit | 2a8edbaf74eec2e73634c40ecd9f1faa79b472c2 (patch) | |
| tree | 00211aef7f4d7f5799b2104ed9d30ba05df635bf /synapse/config/_base.py | |
| parent | Merge branch 'erikj/msc_1813' into erikj/require_format_version (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-2a8edbaf74eec2e73634c40ecd9f1faa79b472c2.tar.xz | |
Merge branch 'erikj/get_pdu_versions' into erikj/require_format_version
Diffstat (limited to 'synapse/config/_base.py')
| -rw-r--r-- | synapse/config/_base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd2d6d52ef..5858fb92b4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -367,7 +367,7 @@ class Config(object): if not keys_directory: keys_directory = os.path.dirname(config_files[-1]) - config_dir_path = os.path.abspath(keys_directory) + self.config_dir_path = os.path.abspath(keys_directory) specified_config = {} for config_file in config_files: @@ -379,7 +379,7 @@ class Config(object): server_name = specified_config["server_name"] config_string = self.generate_config( - config_dir_path=config_dir_path, + config_dir_path=self.config_dir_path, data_dir_path=os.getcwd(), server_name=server_name, generate_secrets=False, |