Skip to content

Commit cfa9721

Browse files
authored
Document use of .well-known for tile server and jitsi (#20734)
1 parent c6c1238 commit cfa9721

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

docs/config.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ For a good example, see https://develop.element.io/config.json.
105105
1. `preferredDomain`: The domain name of the preferred Jitsi instance. Defaults
106106
to `meet.element.io`. This is used whenever a user clicks on the voice/video
107107
call buttons - integration managers may use a different domain.
108+
This setting is ignored if your homeserver provides
109+
`/.well-known/matrix/client` in its well-known location, and the JSON file
110+
at that location has a key `m.vector.riot.jitsi`. In this case, the
111+
configuration found in the well-known location is used instead.
112+
108113
1. `enable_presence_by_hs_url`: The property key should be the URL of the homeserver
109114
and its value defines whether to enable/disable the presence status display
110115
from that homeserver. If no options are configured, presence is shown for all
@@ -154,6 +159,11 @@ For a good example, see https://develop.element.io/config.json.
154159
2. `environment`: (optional) The [Environment](https://docs.sentry.io/product/sentry-basics/environments/) to pass to sentry
155160
1. `map_style_url`: Map tile server style URL for location sharing. e.g.
156161
'https://api.maptiler.com/maps/streets/style.json?key=YOUR_KEY_GOES_HERE'
162+
This setting is ignored if your homeserver provides
163+
`/.well-known/matrix/client` in its well-known location, and the JSON file
164+
at that location has a key `m.tile_server` (or the unstable version
165+
`org.matrix.msc3488.tile_server`). In this case, the configuration found in
166+
the well-known location is used instead.
157167
1. `analyticsOwner`: The entity that analytics data is being sent to. Used in copy
158168
when explaining to the user where data is being sent. If not set, defaults to `brand`.
159169

0 commit comments

Comments
 (0)