diff options
author | David Baker <dbkr@users.noreply.github.com> | 2016-06-01 15:32:52 +0100 |
---|---|---|
committer | David Baker <dbkr@users.noreply.github.com> | 2016-06-01 15:32:52 +0100 |
commit | 00c487a8dbba7b7767ed207dcf835d4cb408ccd9 (patch) | |
tree | d0510818ac8d57ecfb7f6b6cf33c20676fd14060 /synapse/config/server.py | |
parent | Merge pull request #810 from matrix-org/dbkr/limit_email_notifs (diff) | |
parent | Inject fake room list handler in tests (diff) | |
download | synapse-00c487a8dbba7b7767ed207dcf835d4cb408ccd9.tar.xz |
Merge pull request #808 from matrix-org/dbkr/room_list_spider
Add secondary_directory_servers option to fetch room list from other servers
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r-- | synapse/config/server.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 0b5f462e44..c2d8f8a52f 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,15 @@ 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 + # This is a temporary stopgap solution to populate new server with a + # list of rooms until there exists a good solution of a decentralized + # room directory. + # secondary_directory_servers: + # - matrix.org + # - vector.im + # List of ports that Synapse should listen on, their purpose and their # configuration. listeners: |