gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #13047 from vector-im/travis/jitsi/wellknown 

Mention Jitsi support at the .well-known level in Jitsi docs
This commit is contained in:
Travis Ralston 2020-04-07 10:02:52 -06:00 committed by GitHub
parent b647e35c48 83088961d0
commit 80866305d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/jitsi-dev.md
View File

@ -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 `url`. The wrapper has some basic functionality for talking to Riot to ensure the
required `postMessage` calls are fulfilled. 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 ## The Jitsi wrapper in Riot
Whenever Riot sees a Jitsi widget, it ditches the `url` and instead replaces it with Whenever Riot sees a Jitsi widget, it ditches the `url` and instead replaces it with
@ -92,3 +95,6 @@ call.
Critically, when the widget URL is reconstructed it does *not* take into account the 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 config.json's `preferredDomain` for Jitsi. If it did this, users would end up on different
conference servers and therefore different calls entirely. 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
docs/jitsi.md
View File

@ -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 **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. 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 ## Mobile app support
Currently the Riot mobile apps do not support custom Jitsi servers and will instead Currently the Riot mobile apps do not support custom Jitsi servers and will instead