aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-01-28 21:47:35 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-01-28 21:47:35 +0100
commit5b53cf1673d29a7b81d552c69295f3dc7c736635 (patch)
tree3015d09994e99203fb3c060f8ef9c14cd65040a5 /app
parent47bcdaaf0dc6d8caaaa8bd30055420ae90cc73eb (diff)
downloadinfrastructure-5b53cf1673d29a7b81d552c69295f3dc7c736635.tar.gz
infrastructure-5b53cf1673d29a7b81d552c69295f3dc7c736635.zip
Trying to switch on a development version
Diffstat (limited to 'app')
-rw-r--r--app/docker-compose.yml10
-rw-r--r--app/jitsi/build/jitsi-conference-focus/Dockerfile5
-rwxr-xr-xapp/jitsi/build/jitsi-xmpp/xmpp_prosody8
-rw-r--r--app/jitsi/integration/docker-compose.yml14
-rw-r--r--app/jitsi/integration/jicofo/jicofo.conf6
-rw-r--r--app/jitsi/integration/prosody/accounts.txt2
-rw-r--r--app/jitsi/integration/prosody/prosody.cfg.lua2
7 files changed, 31 insertions, 16 deletions
diff --git a/app/docker-compose.yml b/app/docker-compose.yml
index 3bab916..72e6955 100644
--- a/app/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -48,8 +48,8 @@ services:
args:
# https://github.com/jitsi/jitsi-meet
PREFIXV: stable/jitsi-meet_
- VERSION: 5390
- image: superboum/amd64_jitsi_meet:v3
+ VERSION: 5463
+ image: superboum/amd64_jitsi_meet:v4
jitsi-conference-focus:
build:
@@ -57,7 +57,7 @@ services:
args:
# https://github.com/jitsi/jicofo
PREFIXV: stable/jitsi-meet_
- VERSION: 5390
+ VERSION: 5463
image: superboum/amd64_jitsi_conference_focus:v7
jitsi-videobridge:
@@ -66,14 +66,14 @@ services:
args:
# https://github.com/jitsi/jitsi-videobridge
PREFIXV: stable/jitsi-meet_
- VERSION: 5390
+ VERSION: 5463
image: superboum/amd64_jitsi_videobridge:v17
jitsi-xmpp:
build:
context: ./jitsi/build/jitsi-xmpp
args:
- MEET_VERSION: 5390
+ MEET_VERSION: 5463
PROSODY_VERSION: 0.11.7-1~buster4
image: superboum/amd64_jitsi_xmpp:v9
diff --git a/app/jitsi/build/jitsi-conference-focus/Dockerfile b/app/jitsi/build/jitsi-conference-focus/Dockerfile
index e67b3de..525bffb 100644
--- a/app/jitsi/build/jitsi-conference-focus/Dockerfile
+++ b/app/jitsi/build/jitsi-conference-focus/Dockerfile
@@ -3,9 +3,9 @@ FROM debian:buster AS builder
ARG PREFIXV
ARG VERSION
RUN apt-get update && \
- apt-get install -y openjdk-11-jdk maven wget unzip && \
- wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip
+ apt-get install -y openjdk-11-jdk-headless maven wget unzip
+RUN wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip
RUN unzip jicofo.zip && \
mv jicofo*${VERSION} jicofo && \
cd jicofo && \
@@ -20,6 +20,5 @@ RUN apt-get update && \
COPY --from=builder /srv/build /usr/share/jicofo
COPY jicofo /usr/local/bin
-ENV JICOFO_SECRET=IAMDEPRECATED
CMD ["/usr/local/bin/jicofo"]
diff --git a/app/jitsi/build/jitsi-xmpp/xmpp_prosody b/app/jitsi/build/jitsi-xmpp/xmpp_prosody
index 4ae73f4..af179e5 100755
--- a/app/jitsi/build/jitsi-xmpp/xmpp_prosody
+++ b/app/jitsi/build/jitsi-xmpp/xmpp_prosody
@@ -1,3 +1,9 @@
#!/bin/bash
-cat /etc/prosody/accounts.txt | xargs -n3 prosodyctl register
+prosodyctl register focus auth.jitsi ${JICOFO_AUTH_PASSWORD}
+prosodyctl register jvb auth.jitsi ${JVB_AUTH_PASSWORD}
+
+# copied from jitsi-meet.postinst
+# Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
+prosodyctl mod_roster_command subscribe focus.jitsi focus@auth.jitsi
+
exec prosody
diff --git a/app/jitsi/integration/docker-compose.yml b/app/jitsi/integration/docker-compose.yml
index 70bb41a..3aa3954 100644
--- a/app/jitsi/integration/docker-compose.yml
+++ b/app/jitsi/integration/docker-compose.yml
@@ -4,16 +4,28 @@ services:
image: superboum/amd64_jitsi_xmpp:v9
volumes:
- "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro"
- - "./prosody/accounts.txt:/etc/prosody/accounts.txt:ro"
- "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt:ro"
- "./prosody/certs/jitsi.key:/var/lib/prosody/jitsi.key:ro"
- "./prosody/certs/auth.jitsi.crt:/var/lib/prosody/auth.jitsi.crt:ro"
- "./prosody/certs/auth.jitsi.key:/var/lib/prosody/auth.jitsi.key:ro"
+ environment:
+ - JICOFO_AUTH_PASSWORD=jicofopass
+ - JVB_AUTH_PASSWORD=jvbpass
+
jitsi-conference-focus:
image: superboum/amd64_jitsi_conference_focus:v7
volumes:
- "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
- "./jicofo/jicofo.conf:/etc/jitsi/jicofo.conf:ro"
+# environment:
+# - JDOMAIN=jitsi
+# - JHOST=jitsi-xmpp
+# - JPORT=5347
+# - JSUBDOMAIN=focus
+# - JICOFO_SECRET=jicofosecretpass
+# - JUSERDOMAIN=auth.jitsi
+# - JUSERNAME=focus@auth.jitsi
+# - JICOFO_AUTH_PASSWORD=jicofopass
# jitsi-meet:
# image: superboum/amd64_jitsi_meet:v1
# ports:
diff --git a/app/jitsi/integration/jicofo/jicofo.conf b/app/jitsi/integration/jicofo/jicofo.conf
index c4fe5e4..477d37e 100644
--- a/app/jitsi/integration/jicofo/jicofo.conf
+++ b/app/jitsi/integration/jicofo/jicofo.conf
@@ -242,8 +242,8 @@ jicofo {
hostname = "jitsi-xmpp"
port = 5222
domain = "auth.jitsi"
- username = "focus"
- password = "xxx"
+ username = "focus@auth.jitsi"
+ password = "jicofopass"
// How long to wait for a response to a stanza before giving up.
reply-timeout = 15 seconds
@@ -261,7 +261,7 @@ jicofo {
port = 5222
domain = "auth.jitsi"
username = "focus"
- password = "xxx"
+ password = "jicofopass"
// How long to wait for a response to a stanza before giving up.
reply-timeout = 15 seconds
diff --git a/app/jitsi/integration/prosody/accounts.txt b/app/jitsi/integration/prosody/accounts.txt
deleted file mode 100644
index ef4f2cd..0000000
--- a/app/jitsi/integration/prosody/accounts.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-focus auth.jitsi xxx
-jvb auth.jitsi yyy
diff --git a/app/jitsi/integration/prosody/prosody.cfg.lua b/app/jitsi/integration/prosody/prosody.cfg.lua
index da38be9..42831ce 100644
--- a/app/jitsi/integration/prosody/prosody.cfg.lua
+++ b/app/jitsi/integration/prosody/prosody.cfg.lua
@@ -85,7 +85,7 @@ VirtualHost "auth.jitsi"
authentication = "internal_plain"
Component "focus.jitsi"
- component_secret = "focusSecret"
+ component_secret = "jicofosecretpass"
Component "speakerstats.jitsi" "speakerstats_component"
muc_component = "conference.jitsi"