summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-05-31 11:55:57 +0100
committerDavid Baker <dave@matrix.org>2016-05-31 11:55:57 +0100
commite1625d62a8313ff34662aa72ae4d0574e540cc2b (patch)
tree20def5e976e0ddbf67a3c805f8c58c174a12ec6d /synapse/config
parentMerge pull request #802 from matrix-org/dbkr/split_room_list_handler (diff)
downloadsynapse-e1625d62a8313ff34662aa72ae4d0574e540cc2b.tar.xz
Add federation room list servlet
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 0b5f462e44..8d554d749d 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -29,6 +29,7 @@ class ServerConfig(Config):
         self.user_agent_suffix = config.get("user_agent_suffix")
         self.use_frozen_dicts = config.get("use_frozen_dicts", True)
         self.public_baseurl = config.get("public_baseurl")
+        self.secondary_directory_servers = config.get("secondary_directory_servers", [])
 
         if self.public_baseurl is not None:
             if self.public_baseurl[-1] != '/':
@@ -156,6 +157,11 @@ class ServerConfig(Config):
         # hard limit.
         soft_file_limit: 0
 
+        # A list of other Home Servers to fetch the public room directory from
+        # and include in the public room directory of this home server
+        # secondary_directory_servers:
+        #     - matrix.org
+
         # List of ports that Synapse should listen on, their purpose and their
         # configuration.
         listeners: