summary refs log tree commit diff
path: root/synapse/config/room_directory.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-24 17:24:35 +0100
committerGitHub <noreply@github.com>2019-06-24 17:24:35 +0100
commitaf8a9629057942d4dfa919df90d76d1fdc549606 (patch)
treef404909096abfe3635a02568f5ff02d79e7126f6 /synapse/config/room_directory.py
parentMerge pull request #5499 from matrix-org/rav/cleanup_metrics (diff)
parentchangelog (diff)
downloadsynapse-af8a9629057942d4dfa919df90d76d1fdc549606.tar.xz
Merge pull request #5523 from matrix-org/rav/arg_defaults
Stop conflating generated config and default config
Diffstat (limited to 'synapse/config/room_directory.py')
-rw-r--r--synapse/config/room_directory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/room_directory.py b/synapse/config/room_directory.py
index 24223db7a1..a92693017b 100644
--- a/synapse/config/room_directory.py
+++ b/synapse/config/room_directory.py
@@ -46,7 +46,7 @@ class RoomDirectoryConfig(Config):
                 _RoomDirectoryRule("room_list_publication_rules", {"action": "allow"})
             ]
 
-    def default_config(self, config_dir_path, server_name, **kwargs):
+    def generate_config_section(self, config_dir_path, server_name, **kwargs):
         return """
         # Uncomment to disable searching the public room list. When disabled
         # blocks searching local and remote room lists for local and remote