From 213c98c00a473bac7363e1a728828e0f056550b8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 19 Mar 2019 16:50:51 +0000 Subject: Add option to disable search room lists This disables both local and remote room list searching. --- synapse/config/room_directory.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'synapse/config') diff --git a/synapse/config/room_directory.py b/synapse/config/room_directory.py index 9b897abe3c..a25a41d16d 100644 --- a/synapse/config/room_directory.py +++ b/synapse/config/room_directory.py @@ -20,6 +20,10 @@ from ._base import Config, ConfigError class RoomDirectoryConfig(Config): def read_config(self, config): + self.enable_room_list_search = config.get( + "enable_room_list_search", True, + ) + alias_creation_rules = config.get("alias_creation_rules") if alias_creation_rules is not None: @@ -54,6 +58,11 @@ class RoomDirectoryConfig(Config): def default_config(self, config_dir_path, server_name, **kwargs): return """ + # Wether the public room list can be searched. When disabled blocks + # searching local and remote room list for local and remote users. + # + #enable_room_list_search: true + # The `alias_creation` option controls who's allowed to create aliases # on this server. # -- cgit 1.5.1 From 926f29ea6d820d1d14fb5677fe948fa2e15d748e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 20 Mar 2019 14:24:53 +0000 Subject: Fix up config comments --- docs/sample_config.yaml | 7 ++++--- synapse/config/room_directory.py | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'synapse/config') diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index f7b1825d61..d1a419b240 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1036,10 +1036,11 @@ password_config: -# Wether the public room list can be searched. When disabled blocks -# searching local and remote room list for local and remote users. +# Uncomment to disable searching the public room list. When disabled +# blocks searching local and remote room lists for local and remote +# users by always returning an empty list for all queries. # -#enable_room_list_search: true +#enable_room_list_search: false # The `alias_creation` option controls who's allowed to create aliases # on this server. diff --git a/synapse/config/room_directory.py b/synapse/config/room_directory.py index a25a41d16d..8a9fded4c5 100644 --- a/synapse/config/room_directory.py +++ b/synapse/config/room_directory.py @@ -58,10 +58,11 @@ class RoomDirectoryConfig(Config): def default_config(self, config_dir_path, server_name, **kwargs): return """ - # Wether the public room list can be searched. When disabled blocks - # searching local and remote room list for local and remote users. + # Uncomment to disable searching the public room list. When disabled + # blocks searching local and remote room lists for local and remote + # users by always returning an empty list for all queries. # - #enable_room_list_search: true + #enable_room_list_search: false # The `alias_creation` option controls who's allowed to create aliases # on this server. -- cgit 1.5.1