diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-23 13:37:49 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-23 13:39:50 +0100 |
| commit | 2036503c9e24198df36e2beca1d8aa8571fc125b (patch) | |
| tree | 67c4a212e4d26b609c6011597c3fee5e6b6c98b2 /docs | |
| parent | Merge commit '3d2acc930' into anoa/dinsic_release_1_31_0 (diff) | |
| parent | Merge tag 'v1.28.0rc1' into develop (diff) | |
| download | synapse-2036503c9e24198df36e2beca1d8aa8571fc125b.tar.xz | |
Merge commit 'd9f1dccba' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index ff5992f92d..454fa74e8f 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -101,6 +101,14 @@ pid_file: DATADIR/homeserver.pid # #limit_profile_requests_to_users_who_share_rooms: true +# Uncomment to prevent a user's profile data from being retrieved and +# displayed in a room until they have joined it. By default, a user's +# profile data is included in an invite event, regardless of the values +# of the above two settings, and whether or not the users share a server. +# Defaults to 'true'. +# +#include_profile_data_on_invite: false + # If set to 'true', removes the need for authentication to access the server's # public rooms directory through the client API, meaning that anyone can # query the room directory. Defaults to 'false'. @@ -767,6 +775,12 @@ acme: # - matrix.org # - example.com +# Uncomment to disable profile lookup over federation. By default, the +# Federation API allows other homeservers to obtain profile data of any user +# on this homeserver. Defaults to 'true'. +# +#allow_profile_lookup_over_federation: false + ## Caching ## |