diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-15 13:27:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 13:27:09 +0100 |
| commit | e457034e99d46d32e3d71eddb12cda07d8a0370e (patch) | |
| tree | 2b3cc4cbf5a17a6de91c6f07e47b038b22186921 /synapse/config | |
| parent | Merge pull request #1117 from matrix-org/erikj/fix_state (diff) | |
| parent | By default limit /publicRooms to 100 entries (diff) | |
| download | synapse-e457034e99d46d32e3d71eddb12cda07d8a0370e.tar.xz | |
Merge pull request #1121 from matrix-org/erikj/public_room_paginate
Add pagination support to publicRooms
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 51eaf423ce..ed5417d0c3 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -29,7 +29,6 @@ class ServerConfig(Config): self.user_agent_suffix = config.get("user_agent_suffix") self.use_frozen_dicts = config.get("use_frozen_dicts", False) 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] != '/': @@ -142,14 +141,6 @@ class ServerConfig(Config): # The GC threshold parameters to pass to `gc.set_threshold`, if defined # gc_thresholds: [700, 10, 10] - # 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 - # List of ports that Synapse should listen on, their purpose and their # configuration. listeners: |