Skip to content

Commit

Permalink
Merge pull request #13047 from vector-im/travis/jitsi/wellknown
Browse files Browse the repository at this point in the history
Mention Jitsi support at the .well-known level in Jitsi docs
  • Loading branch information
turt2live authored Apr 7, 2020
2 parents b647e35 + 8308896 commit 8086630
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
6 changes: 6 additions & 0 deletions docs/jitsi-dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ The Jitsi widget created by Riot uses a local `jitsi.html` wrapper (or one hoste
`url`. The wrapper has some basic functionality for talking to Riot to ensure the
required `postMessage` calls are fulfilled.

**Note**: Per [jitsi.md](./jitsi.md) the `preferredDomain` can also come from the server's
client .well-known data.

## The Jitsi wrapper in Riot

Whenever Riot sees a Jitsi widget, it ditches the `url` and instead replaces it with
Expand All @@ -92,3 +95,6 @@ call.
Critically, when the widget URL is reconstructed it does *not* take into account the
config.json's `preferredDomain` for Jitsi. If it did this, users would end up on different
conference servers and therefore different calls entirely.

**Note**: Per [jitsi.md](./jitsi.md) the `preferredDomain` can also come from the server's
client .well-known data.
10 changes: 10 additions & 0 deletions docs/jitsi.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ should start a new conference on your Jitsi server.
**Note**: The widget URL will point to a `jitsi.html` page hosted by Riot. The Jitsi
domain will appear later in the URL as a configuration parameter.

**Hint**: If you want everyone on your homeserver to use the same Jitsi server by
default, set the following on your homeserver's `/.well-known/matrix/client` config:
```json
{
"im.vector.riot.jitsi": {
"preferredDomain": "your.jitsi.example.org"
}
}
```

## Mobile app support

Currently the Riot mobile apps do not support custom Jitsi servers and will instead
Expand Down

0 comments on commit 8086630

Please sign in to comment.