summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-06-24 11:45:11 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-06-24 16:41:48 +0100
commit84875301b679b33284824d9bc413becc10427987 (patch)
tree577d680284b7aa66ba6b8593bb062fc6c9df682f /docs
parentMerge pull request #5495 from matrix-org/babolivier/deactivate_bg_job_typo (diff)
downloadsynapse-84875301b679b33284824d9bc413becc10427987.tar.xz
Split public rooms directory auth config in two
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml12
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index b7c83ceb97..daf0687dbb 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -77,11 +77,15 @@ pid_file: DATADIR/homeserver.pid
 #
 #require_auth_for_profile_requests: true
 
-# If set to 'true', requires authentication to access the server's
-# public rooms directory through the client API, and forbids any other
-# homeserver to fetch it via federation. Defaults to 'false'.
+# If set to 'false', requires authentication to access the server's public rooms
+# directory through the client API. Defaults to 'true'.
 #
-#restrict_public_rooms_to_local_users: true
+#allow_public_rooms_without_auth: false
+
+# If set to 'false', forbids any other homeserver to fetch the server's public
+# rooms directory via federation. Defaults to 'true'.
+#
+#allow_public_rooms_over_federation: false
 
 # The default room version for newly created rooms.
 #