mirror of https://github.com/vector-im/riot-web
Update default Jitsi URLs to meet.element.io (#20487)
parent
da8476e426
commit
d7813c09d9
|
@ -47,6 +47,6 @@
|
||||||
"breadcrumbs": true
|
"breadcrumbs": true
|
||||||
},
|
},
|
||||||
"jitsi": {
|
"jitsi": {
|
||||||
"preferredDomain": "jitsi.riot.im"
|
"preferredDomain": "meet.element.io"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,7 +103,7 @@ For a good example, see https://develop.element.io/config.json.
|
||||||
1. `jitsi`: Used to change the default conference options. Learn more about the
|
1. `jitsi`: Used to change the default conference options. Learn more about the
|
||||||
Jitsi options at [jitsi.md](./jitsi.md).
|
Jitsi options at [jitsi.md](./jitsi.md).
|
||||||
1. `preferredDomain`: The domain name of the preferred Jitsi instance. Defaults
|
1. `preferredDomain`: The domain name of the preferred Jitsi instance. Defaults
|
||||||
to `jitsi.riot.im`. This is used whenever a user clicks on the voice/video
|
to `meet.element.io`. This is used whenever a user clicks on the voice/video
|
||||||
call buttons - integration managers may use a different domain.
|
call buttons - integration managers may use a different domain.
|
||||||
1. `enable_presence_by_hs_url`: The property key should be the URL of the homeserver
|
1. `enable_presence_by_hs_url`: The property key should be the URL of the homeserver
|
||||||
and its value defines whether to enable/disable the presence status display
|
and its value defines whether to enable/disable the presence status display
|
||||||
|
|
|
@ -30,7 +30,7 @@ to your [config](./config.md) the following:
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
The default is `jitsi.riot.im` (a free service offered by Element), and the demo site for
|
The default is `meet.element.io` (a free service offered by Element), and the demo site for
|
||||||
Jitsi uses `meet.jit.si` (also free).
|
Jitsi uses `meet.jit.si` (also free).
|
||||||
|
|
||||||
Once you've applied the config change, refresh Element and press the call button. This
|
Once you've applied the config change, refresh Element and press the call button. This
|
||||||
|
@ -59,7 +59,7 @@ calls work directly between clients or via TURN servers configured on the respec
|
||||||
homeservers.
|
homeservers.
|
||||||
|
|
||||||
For rooms with more than 2 joined members, when creating a Jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using the [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) hosted on `app.element.io`.
|
For rooms with more than 2 joined members, when creating a Jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using the [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) hosted on `app.element.io`.
|
||||||
The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `config.xml` (jitsi.riot.im)
|
The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `config.json` (meet.element.io)
|
||||||
|
|
||||||
For active Jitsi widgets in the room, a native Jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data.
|
For active Jitsi widgets in the room, a native Jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data.
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my-
|
||||||
"breadcrumbs": true
|
"breadcrumbs": true
|
||||||
},
|
},
|
||||||
"jitsi": {
|
"jitsi": {
|
||||||
"preferredDomain": "jitsi.riot.im"
|
"preferredDomain": "meet.element.io"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,20 +12,20 @@ const ProxyAgent = require("simple-proxy-agent");
|
||||||
console.log("Making webapp directory");
|
console.log("Making webapp directory");
|
||||||
mkdirp.sync("webapp");
|
mkdirp.sync("webapp");
|
||||||
|
|
||||||
// curl -s https://jitsi.riot.im/libs/external_api.min.js > ./webapp/jitsi_external_api.min.js
|
// curl -s https://meet.element.io/libs/external_api.min.js > ./webapp/jitsi_external_api.min.js
|
||||||
console.log("Downloading Jitsi script");
|
console.log("Downloading Jitsi script");
|
||||||
const fname = path.join("webapp", "jitsi_external_api.min.js");
|
const fname = path.join("webapp", "jitsi_external_api.min.js");
|
||||||
|
|
||||||
const options = {};
|
const options = {};
|
||||||
if (process.env.HTTPS_PROXY) {
|
if (process.env.HTTPS_PROXY) {
|
||||||
options.agent = new ProxyAgent(process.env.HTTPS_PROXY, {tunnel: true});
|
options.agent = new ProxyAgent(process.env.HTTPS_PROXY, { tunnel: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
fetch("https://jitsi.riot.im/libs/external_api.min.js", options).then(res => {
|
fetch("https://meet.element.io/libs/external_api.min.js", options).then(res => {
|
||||||
const stream = fs.createWriteStream(fname);
|
const stream = fs.createWriteStream(fname);
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
res.body.pipe(stream);
|
res.body.pipe(stream);
|
||||||
res.body.on('error', err => reject(err));
|
res.body.on('error', err => reject(err));
|
||||||
res.body.on('finish', () => resolve());
|
res.body.on('finish', () => resolve());
|
||||||
});
|
});
|
||||||
}).then(() => console.log('Done with Jitsi download'));
|
}).then(() => console.log('Done with Jitsi download'));
|
||||||
|
|
Loading…
Reference in New Issue