summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-07 12:51:57 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-07 12:51:57 +0100
commit3523f5432a79659ac365dc2ff1212aa1a3707d8e (patch)
treef9ebabf34898e8efd9def19c3980e6aa8ae9c279 /synapse/config
parentchangelog (diff)
downloadsynapse-3523f5432a79659ac365dc2ff1212aa1a3707d8e.tar.xz
Don't expose default_room_version as config opt
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py14
1 files changed, 0 insertions, 14 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 68ef2789d3..6a471a0a5e 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -16,7 +16,6 @@
 
 import logging
 
-from synapse.api.constants import KNOWN_ROOM_VERSIONS
 from synapse.http.endpoint import parse_and_validate_server_name
 
 from ._base import Config, ConfigError
@@ -76,16 +75,6 @@ class ServerConfig(Config):
             )
         else:
             self.max_mau_value = 0
-
-        # the version of rooms created by default on this server
-        self.default_room_version = str(config.get(
-            "default_room_version", "1",
-        ))
-        if self.default_room_version not in KNOWN_ROOM_VERSIONS:
-            raise ConfigError("Unrecognised value '%s' for default_room_version" % (
-                self.default_room_version,
-            ))
-
         # FIXME: federation_domain_whitelist needs sytests
         self.federation_domain_whitelist = None
         federation_domain_whitelist = config.get(
@@ -260,9 +249,6 @@ class ServerConfig(Config):
         # (except those sent by local server admins). The default is False.
         # block_non_admin_invites: True
 
-        # The room_version of rooms which are created by default by this server.
-        # default_room_version: 1
-
         # Restrict federation to the following whitelist of domains.
         # N.B. we recommend also firewalling your federation listener to limit
         # inbound federation traffic as early as possible, rather than relying