From 47bcdaaf0dc6d8caaaa8bd30055420ae90cc73eb Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Thu, 28 Jan 2021 21:05:10 +0100 Subject: Rework prosody's configuration --- app/docker-compose.yml | 3 +- app/jitsi/build/jitsi-conference-focus/jicofo | 6 - app/jitsi/build/jitsi-xmpp/Dockerfile | 16 ++- app/jitsi/integration/README.md | 6 + app/jitsi/integration/docker-compose.yml | 23 ++-- app/jitsi/integration/jicofo/jicofo.conf | 14 +-- app/jitsi/integration/prosody/prosody.cfg.lua | 137 +++++++++++++-------- app/jitsi/integration/prosody/prosody.cfg.lua.back | 64 ++++++++++ 8 files changed, 192 insertions(+), 77 deletions(-) create mode 100644 app/jitsi/integration/prosody/prosody.cfg.lua.back (limited to 'app') diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 14a62b8..3bab916 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -73,7 +73,8 @@ services: build: context: ./jitsi/build/jitsi-xmpp args: - VERSION: 0.11.7-1~buster4 + MEET_VERSION: 5390 + PROSODY_VERSION: 0.11.7-1~buster4 image: superboum/amd64_jitsi_xmpp:v9 plume: diff --git a/app/jitsi/build/jitsi-conference-focus/jicofo b/app/jitsi/build/jitsi-conference-focus/jicofo index 31cd9c4..2225e98 100755 --- a/app/jitsi/build/jitsi-conference-focus/jicofo +++ b/app/jitsi/build/jitsi-conference-focus/jicofo @@ -1,13 +1,7 @@ #!/bin/bash -cp ${JITSI_CERTS_FOLDER}/auth.jitsi.deuxfleurs.fr.crt /usr/local/share/ca-certificates/auth.jitsi.deuxfleurs.fr.crt update-ca-certificates -f -cat >> /etc/hosts <