summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-10-19 09:06:15 +0100
committerNeil Johnson <neil@matrix.org>2019-10-19 09:06:15 +0100
commit82c8799ec7f6676555033f5d804cbed443a1ea3e (patch)
tree16dd2ea591a43d672be66e229ec60b6a7c9b6561
parentRemove Auth.check method (#6217) (diff)
downloadsynapse-82c8799ec7f6676555033f5d804cbed443a1ea3e.tar.xz
Set room version default to 5
-rw-r--r--changelog.d/6220.feature1
-rw-r--r--docs/sample_config.yaml2
-rw-r--r--synapse/config/server.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/6220.feature b/changelog.d/6220.feature
new file mode 100644
index 0000000000..8343e9912b
--- /dev/null
+++ b/changelog.d/6220.feature
@@ -0,0 +1 @@
+Increase default room version from 4 to 5, thereby enforcing server key validity period checks.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 8226978ba6..af3ca0f722 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -72,7 +72,7 @@ pid_file: DATADIR/homeserver.pid
 # For example, for room version 1, default_room_version should be set
 # to "1".
 #
-#default_room_version: "4"
+#default_room_version: "5"
 
 # The GC threshold parameters to pass to `gc.set_threshold`, if defined
 #
diff --git a/synapse/config/server.py b/synapse/config/server.py
index afc4d6a4ab..26e6d84c09 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -41,7 +41,7 @@ logger = logging.Logger(__name__)
 # in the list.
 DEFAULT_BIND_ADDRESSES = ["::", "0.0.0.0"]
 
-DEFAULT_ROOM_VERSION = "4"
+DEFAULT_ROOM_VERSION = "5"
 
 ROOM_COMPLEXITY_TOO_GREAT = (
     "Your homeserver is unable to join rooms this large or complex. "