Deuxfleurs/infrastructure
Archived
24
2
Fork 2
Code Issues 22 Pull requests Projects 1 Releases Wiki Activity

Still so broken...

Browse source
This commit is contained in:
Quentin 2021-01-28 23:02:37 +01:00
parent 5b53cf1673
commit 982efd1b49
6 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/docker-compose.yml
View file

@ -56,7 +56,7 @@ services:
context: ./jitsi/build/jitsi-conference-focus
args:
# https://github.com/jitsi/jicofo
PREFIXV: stable/jitsi-meet_
PREFIXV: jitsi-meet_
VERSION: 5463
image: superboum/amd64_jitsi_conference_focus:v7
@ -65,7 +65,7 @@ services:
context: ./jitsi/build/jitsi-videobridge
args:
# https://github.com/jitsi/jitsi-videobridge
PREFIXV: stable/jitsi-meet_
PREFIXV: jitsi-meet_
VERSION: 5463
image: superboum/amd64_jitsi_videobridge:v17
@ -73,6 +73,7 @@ services:
build:
context: ./jitsi/build/jitsi-xmpp
args:
PREFIXV: jitsi-meet_
MEET_VERSION: 5463
PROSODY_VERSION: 0.11.7-1~buster4
image: superboum/amd64_jitsi_xmpp:v9

9
app/jitsi/build/jitsi-conference-focus/Dockerfile
View file

@ -1,10 +1,9 @@
FROM debian:buster AS builder
FROM fedora:33 AS builder
RUN dnf install -y java-latest-openjdk-headless maven wget unzip
ARG PREFIXV
ARG VERSION
RUN apt-get update && \
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 && \
@ -13,7 +12,7 @@ RUN unzip jicofo.zip && \
unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \
mv jicofo-1.1-SNAPSHOT /srv/build
FROM debian:buster
FROM debian:bullseye
RUN apt-get update && \
apt-get install -y openjdk-11-jre-headless ca-certificates

9
app/jitsi/build/jitsi-xmpp/Dockerfile
View file

@ -1,11 +1,12 @@
FROM debian:buster as builder
ARG MEET_VERSION
WORKDIR /tmp
ARG MEET_VERSION
ARG PREFIXV
RUN apt-get update && \
apt-get install -y wget unzip && \
wget https://github.com/jitsi/jitsi-meet/archive/stable/jitsi-meet_${MEET_VERSION}.zip -O meet.zip && \
unzip meet.zip && \
apt-get install -y wget unzip
RUN wget https://github.com/jitsi/jitsi-meet/archive/${PREFIXV}${MEET_VERSION}.zip -O meet.zip
RUN unzip meet.zip && \
mv jitsi-meet-* jitsi-meet
FROM debian:buster

18
app/jitsi/integration/docker-compose.yml
View file

@ -17,15 +17,15 @@ services:
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
environment:
- JDOMAIN=jitsi
- JHOST=jitsi-xmpp
- JPORT=5347
- JSUBDOMAIN=focus
- JICOFO_SECRET=jicofosecretpass
- JUSERDOMAIN=auth.jitsi
- JUSERNAME=focus
- JICOFO_AUTH_PASSWORD=jicofopass
# jitsi-meet:
# image: superboum/amd64_jitsi_meet:v1
# ports:

4
app/jitsi/integration/jicofo/jicofo.conf
View file

@ -242,14 +242,14 @@ jicofo {
hostname = "jitsi-xmpp"
port = 5222
domain = "auth.jitsi"
username = "focus@auth.jitsi"
username = "focus"
password = "jicofopass"
// How long to wait for a response to a stanza before giving up.
reply-timeout = 15 seconds
// The JID/domain of the MUC service used for conferencing.
# conference-muc-jid = conference.example.com
conference-muc-jid = conference.jitsi
// A flag to suppress the TLS certificate verification.
disable-certificate-verification = false

11
app/jitsi/integration/prosody/prosody.cfg.lua
View file

@ -1,4 +1,9 @@
plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }
log = {
--log less on console with warn="*console"; or err="*console" or more with debug="*console"
debug="*console";
}
daemonize = false
use_libevent = true
@ -29,7 +34,7 @@ ssl = {
}
VirtualHost "jitsi"
-- enabled = false -- Remove this line to enable this host
enabled = true -- Remove this line to enable this host
authentication = "anonymous"
-- Properties below are modified by jitsi-meet-tokens package config
-- and authentication above is switched to "token"
@ -67,7 +72,7 @@ Component "conference.jitsi" "muc"
"muc_domain_mapper";
--"token_verification";
}
admins = { "focusUser@auth.jitsi" }
admins = { "focus@auth.jitsi" }
muc_room_locking = false
muc_room_default_public_jids = true
@ -77,7 +82,7 @@ Component "internal.auth.jitsi" "muc"
modules_enabled = {
"ping";
}
admins = { "focusUser@auth.jitsi", "jvb@auth.jitsi" }
admins = { "focus@auth.jitsi", "jvb@auth.jitsi" }
muc_room_locking = false
muc_room_default_public_jids = true