diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-25 11:09:53 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-25 11:09:53 +0000 |
| commit | 821b65aeb51e744055e0eaaf9b528587fa494b20 (patch) | |
| tree | c4231f142f51d319c4b86c2dcc0e4fa691a3bed0 /synapse/config/_base.py | |
| parent | Move tag and direct state copying into separate function (diff) | |
| parent | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms (diff) | |
| download | synapse-821b65aeb51e744055e0eaaf9b528587fa494b20.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upgrade
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, |