summary refs log tree commit diff
path: root/synapse/config/repository.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-22 00:00:20 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-24 14:14:52 +0100
commit16b52642e274054a070fb494684547a77790c22b (patch)
treedf8d390407e6848473d38f3589d8ae4d5aa1a5a4 /synapse/config/repository.py
parentEnsure that all config options have sensible defaults (diff)
downloadsynapse-16b52642e274054a070fb494684547a77790c22b.tar.xz
Don't load the generated config as the default.
It's too confusing.
Diffstat (limited to 'synapse/config/repository.py')
-rw-r--r--synapse/config/repository.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py
index 43e6c4921f..80a628d9b0 100644
--- a/synapse/config/repository.py
+++ b/synapse/config/repository.py
@@ -190,7 +190,7 @@ class ContentRepositoryConfig(Config):
 
             self.url_preview_url_blacklist = config.get("url_preview_url_blacklist", ())
 
-    def default_config(self, data_dir_path, **kwargs):
+    def generate_config_section(self, data_dir_path, **kwargs):
         media_store = os.path.join(data_dir_path, "media_store")
         uploads_path = os.path.join(data_dir_path, "uploads")