diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-24 16:08:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-24 16:08:02 +0100 |
commit | deb4fe6ef38ff5ed849dfbc1ca0a31f242811a27 (patch) | |
tree | ebc82e380d7cea9d544e525d8835e6f3199c1126 /docs/sample_config.yaml | |
parent | Merge pull request #5531 from matrix-org/erikj/workers_pagination_token (diff) | |
parent | Split public rooms directory auth config in two (diff) | |
download | synapse-deb4fe6ef38ff5ed849dfbc1ca0a31f242811a27.tar.xz |
Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms
Split public rooms directory auth config in two
Diffstat (limited to 'docs/sample_config.yaml')
-rw-r--r-- | docs/sample_config.yaml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index bb07b02f4e..92a23245ff 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -54,11 +54,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. # |