fix integration

This commit is contained in:
Quentin 2023-02-02 15:32:40 +01:00
parent 2d6616195f
commit a3ca27055d
Signed by untrusted user: quentin
GPG key ID: E9602264D639FF68
4 changed files with 35 additions and 3 deletions

View file

@ -47,6 +47,35 @@ But we can see this is a deprecated thing, it has been already removed from mast
For now (as per v5390) we will keep `JICOFO_SECRET` environment variable but will assume no other environment variable is set For now (as per v5390) we will keep `JICOFO_SECRET` environment variable but will assume no other environment variable is set
But maybe this value is deprecated: the check is still here but it is not used anymore?! But maybe this value is deprecated: the check is still here but it is not used anymore?!
## Run the integration suite
start a maintainance container
```
docker run --rm -it -v `pwd`/prosody/certs/:/var/lib/prosody/ -v `pwd`/prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro --user root superboum/amd64_jitsi_xmpp:v11 bash
```
then generate certificates from inside this container
```
cd /var/lib/prosody/
chown -R prosody .
prosodyctl cert generate auth.jitsi
prosodyctl cert generate jitsi
```
then start the stack
```bash
docker-compose up
```
go to the URL by using a LAN/WAN IP (not localhost) and accept the self signed cert.
```
https://192.168.1.143
```
## Generate certs with prosody ## Generate certs with prosody
``` ```
prosodyctl cert generate auth.jitsi prosodyctl cert generate auth.jitsi

View file

@ -22,7 +22,7 @@ var config = {
}, },
// BOSH URL. FIXME: use XEP-0156 to discover it. // BOSH URL. FIXME: use XEP-0156 to discover it.
bosh: '//rayonx.machine.deuxfleurs.fr/http-bind', bosh: '//192.168.1.143/http-bind',
// Websocket URL // Websocket URL
// websocket: 'wss://jitsi-meet.example.com/xmpp-websocket', // websocket: 'wss://jitsi-meet.example.com/xmpp-websocket',

View file

@ -63,8 +63,9 @@ http {
location /http-bind { location /http-bind {
proxy_pass http://jitsi-xmpp:5280/http-bind; proxy_pass http://jitsi-xmpp:5280/http-bind;
proxy_set_header X-Forwarded-For \$remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host \$http_host; #proxy_set_header Host $http_host;
proxy_set_header Host jitsi-bosh;
} }

View file

@ -50,6 +50,7 @@ consider_bosh_secure = true;
component_ports = { } -- it seems we don't need external components for now... component_ports = { } -- it seems we don't need external components for now...
https_ports = { } -- we don't need http https_ports = { } -- we don't need http
http_ports = { 5280 } http_ports = { 5280 }
http_interfaces = { "0.0.0.0", "::" }
c2s_ports = { 5222 } c2s_ports = { 5222 }
s2s_ports = { } s2s_ports = { }
@ -90,6 +91,7 @@ VirtualHost "jitsi"
c2s_require_encryption = false c2s_require_encryption = false
lobby_muc = "lobby.jitsi" lobby_muc = "lobby.jitsi"
main_muc = "conference.jitsi" main_muc = "conference.jitsi"
http_host = "jitsi-bosh"
-- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
Component "conference.jitsi" "muc" Component "conference.jitsi" "muc"