summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-01-23 19:39:06 +1100
committerGitHub <noreply@github.com>2019-01-23 19:39:06 +1100
commit6129e52f437c2e03b711453434924e170f3d11bf (patch)
treeaaf12666831bdf6a7ebb1ead7840f22528b00f13 /synapse/config/_base.py
parentMerge pull request #4434 from matrix-org/erikj/fix_user_ips_dedup (diff)
downloadsynapse-6129e52f437c2e03b711453434924e170f3d11bf.tar.xz
Support ACME for certificate provisioning (#4384)
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r--synapse/config/_base.py4
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,