adrien/infrastructure
1
0
Fork 0
forked from Deuxfleurs/infrastructure
Code Issues Pull requests Releases Wiki Activity

Finally it seems to work

Browse source
This commit is contained in:
Quentin 2020-09-13 11:46:14 +02:00
parent 744fa8b8c9
commit da034dabfc
9 changed files with 55 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build/docker-compose.yml
View file

@ -44,7 +44,7 @@ services:
# https://github.com/jitsi/jicofo # https://github.com/jitsi/jicofo
PREFIXV: stable/jitsi-meet_ PREFIXV: stable/jitsi-meet_
VERSION: 4966 VERSION: 4966
image: superboum/amd64_jitsi_conference_focus:v3 image: superboum/amd64_jitsi_conference_focus:v4
jitsi-videobridge: jitsi-videobridge:
build: build:
@ -53,11 +53,11 @@ services:
# https://github.com/jitsi/jitsi-videobridge # https://github.com/jitsi/jitsi-videobridge
PREFIXV: stable/jitsi-meet_ PREFIXV: stable/jitsi-meet_
VERSION: 4966 VERSION: 4966
image: superboum/amd64_jitsi_videobridge:v13 image: superboum/amd64_jitsi_videobridge:v14
jitsi-xmpp: jitsi-xmpp:
build: build:
context: ./jitsi-xmpp context: ./jitsi-xmpp
args: args:
VERSION: fake-1 VERSION: fake-1
image: superboum/amd64_jitsi_xmpp:v2 image: superboum/amd64_jitsi_xmpp:v3

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

@ -16,7 +16,9 @@ RUN unzip jicofo.zip && \
FROM debian:buster FROM debian:buster
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y openjdk-11-jdk ca-certificates apt-get install -y openjdk-11-jre-headless ca-certificates
ENV JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/root -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=.sip-communicator -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi"
COPY --from=builder /srv/build /srv/jicofo COPY --from=builder /srv/build /srv/jicofo
COPY jicofo /usr/local/bin/jicofo COPY jicofo /usr/local/bin/jicofo

1
app/build/jitsi-conference-focus/sip-communicator.properties
View file

@ -1 +1,2 @@
org.jitsi.jicofo.SHORT_ID=1 org.jitsi.jicofo.SHORT_ID=1
org.jitsi.jicofo.BRIDGE_MUC=JvbBrewery@internal.auth.jitsi.deuxfleurs.fr

19
app/build/jitsi-videobridge/jvb_run
View file

@ -8,9 +8,24 @@ EOF
mkdir -p /root/.sip-communicator mkdir -p /root/.sip-communicator
cat > /root/.sip-communicator/sip-communicator.properties <<EOF cat > /root/.sip-communicator/sip-communicator.properties <<EOF
# Enable broadcasting stats/presence in a MUC
org.jitsi.videobridge.ENABLE_STATISTICS=true
org.jitsi.videobridge.STATISTICS_TRANSPORT=muc
# Connect to the first XMPP server
org.jitsi.videobridge.xmpp.user.shard.HOSTNAME=jitsi.deuxfleurs.fr
org.jitsi.videobridge.xmpp.user.shard.DOMAIN=auth.jitsi.deuxfleurs.fr
org.jitsi.videobridge.xmpp.user.shard.USERNAME=jvb
org.jitsi.videobridge.xmpp.user.shard.PASSWORD=${JITSI_SECRET_VIDEOBRIDGE}
org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.jitsi.deuxfleurs.fr
org.jitsi.videobridge.xmpp.user.shard.MUC=JvbBrewery@internal.auth.jitsi.deuxfleurs.fr
org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME=singleton
org.jitsi.videobridge.xmpp.user.shard.DISABLE_CERTIFICATE_VERIFICATION=true
# Do we need it? @FIXME
org.jitsi.impl.neomedia.transform.srtp.SRTPCryptoContext.checkReplay=false org.jitsi.impl.neomedia.transform.srtp.SRTPCryptoContext.checkReplay=false
# The videobridge uses 443 by default with 4443 as a fallback, but since we're already
# running nginx on 443 in this example doc, we specify 4443 manually to avoid a race condition # NAT things, two times just in case...
org.ice4j.ice.harvest.TCP_HARVESTER_PORT=${JITSI_VIDEO_TCP} org.ice4j.ice.harvest.TCP_HARVESTER_PORT=${JITSI_VIDEO_TCP}
org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP} org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP}
org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP} org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP}

39
app/build/jitsi-xmpp/xmpp_conf
View file

@ -8,31 +8,36 @@ EOF
mkdir -p /etc/prosody/conf.{d,avail}/ mkdir -p /etc/prosody/conf.{d,avail}/
cat > /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua <<EOF cat > /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua <<EOF
VirtualHost "jitsi.deuxfleurs.fr" VirtualHost "jitsi.deuxfleurs.fr"
authentication = "anonymous" authentication = "anonymous"
ssl = { ssl = {
key = "/var/lib/prosody/jitsi.deuxfleurs.fr.key"; key = "/var/lib/prosody/jitsi.deuxfleurs.fr.key";
certificate = "/var/lib/prosody/jitsi.deuxfleurs.fr.crt"; certificate = "/var/lib/prosody/jitsi.deuxfleurs.fr.crt";
} }
modules_enabled = { modules_enabled = {
"bosh"; "bosh";
"pubsub"; "pubsub";
} }
c2s_require_encryption = false c2s_require_encryption = false
VirtualHost "auth.jitsi.deuxfleurs.fr" VirtualHost "auth.jitsi.deuxfleurs.fr"
ssl = { ssl = {
key = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.key"; key = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.key";
certificate = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.crt"; certificate = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.crt";
} }
authentication = "internal_plain" authentication = "internal_plain"
admins = { "focus@auth.jitsi.deuxfleurs.fr"}
admins = { "focus@auth.jitsi.deuxfleurs.fr" }
Component "conference.jitsi.deuxfleurs.fr" "muc" Component "conference.jitsi.deuxfleurs.fr" "muc"
Component "internal.auth.jitsi.deuxfleurs.fr" "muc"
storage = "memory"
modules_enabled = { "ping"; }
admins = { "focus@auth.jitsi.deuxfleurs.fr", "jvb@auth.jitsi.deuxfleurs.fr" }
Component "jitsi-videobridge.jitsi.deuxfleurs.fr" Component "jitsi-videobridge.jitsi.deuxfleurs.fr"
component_secret = "${JITSI_SECRET_VIDEOBRIDGE}" component_secret = "${JITSI_SECRET_VIDEOBRIDGE}"
Component "focus.jitsi.deuxfleurs.fr" Component "focus.jitsi.deuxfleurs.fr"
component_secret = "${JITSI_SECRET_JICOFO_COMPONENT}" component_secret = "${JITSI_SECRET_JICOFO_COMPONENT}"
EOF EOF
ln -sf \ ln -sf \

1
app/build/jitsi-xmpp/xmpp_run
View file

@ -10,6 +10,7 @@ ln -sf \
/usr/local/share/ca-certificates/auth.jitsi.deuxfleurs.fr.crt /usr/local/share/ca-certificates/auth.jitsi.deuxfleurs.fr.crt
prosodyctl register focus auth.jitsi.deuxfleurs.fr ${JITSI_SECRET_JICOFO_USER} prosodyctl register focus auth.jitsi.deuxfleurs.fr ${JITSI_SECRET_JICOFO_USER}
prosodyctl register jvb auth.jitsi.deuxfleurs.fr ${JITSI_SECRET_VIDEOBRIDGE}
mkdir /run/prosody mkdir /run/prosody
touch /run/prosody/prosody.pid touch /run/prosody/prosody.pid

2
app/integration/jitsi/01_gen_certs.yml
View file

@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
jitsi-xmpp: jitsi-xmpp:
image: ./jitsi-xmpp:v2 image: superboum/amd64_jitsi_xmpp:v2
command: ["/usr/local/bin/xmpp_gen"] command: ["/usr/local/bin/xmpp_gen"]
volumes: [ './jitsi-certs/:/certs:rw' ] volumes: [ './jitsi-certs/:/certs:rw' ]
env_file: [ 'dev.env' ] env_file: [ 'dev.env' ]

9
app/integration/jitsi/02_run.yml
View file

@ -1,8 +1,7 @@
version: '3.4' version: '3.4'
services: services:
jitsi-xmpp: jitsi-xmpp:
image: superboum/amd64_jitsi_xmpp:v2 image: superboum/amd64_jitsi_xmpp:v3
network_mode: host
ports: ports:
- "5222:5222" - "5222:5222"
- "5347:5347" - "5347:5347"
@ -16,15 +15,13 @@ services:
env_file: [ 'dev.env' ] env_file: [ 'dev.env' ]
volumes: [ './jitsi-certs/:/certs:ro' ] volumes: [ './jitsi-certs/:/certs:ro' ]
jitsi-conference-focus: jitsi-conference-focus:
image: superboum/amd64_jitsi_conference_focus:v3 image: superboum/amd64_jitsi_conference_focus:v4
env_file: [ 'dev.env' ] env_file: [ 'dev.env' ]
volumes: [ './jitsi-certs/:/certs:ro' ] volumes: [ './jitsi-certs/:/certs:ro' ]
jitsi-videobridge: jitsi-videobridge:
image: superboum/amd64_jitsi_videobridge:v11 image: superboum/amd64_jitsi_videobridge:v14
network_mode: host
ports: ports:
- "8080:8080/tcp" - "8080:8080/tcp"
- "10000:10000/udp" - "10000:10000/udp"
env_file: [ 'dev.env' ] env_file: [ 'dev.env' ]
volumes: [ './jitsi-certs/:/certs:ro' ] volumes: [ './jitsi-certs/:/certs:ro' ]

8
app/integration/jitsi/dev.env
View file

@ -2,9 +2,9 @@ JITSI_SECRET_VIDEOBRIDGE=S3CR3T01
JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02 JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02
JITSI_SECRET_JICOFO_USER=S3CR3T03 JITSI_SECRET_JICOFO_USER=S3CR3T03
JITSI_PROSODY_BOSH_PORT=5280 JITSI_PROSODY_BOSH_PORT=5280
JITSI_PROSODY_BOSH_HOST=127.0.0.1 JITSI_PROSODY_BOSH_HOST=172.17.0.1
JITSI_PROSODY_HOST=127.0.0.1 JITSI_PROSODY_HOST=172.17.0.1
JITSI_CERTS_FOLDER=/certs/ JITSI_CERTS_FOLDER=/certs/
JITSI_NAT_PUBLIC_IP=77.204.7.239 JITSI_NAT_PUBLIC_IP=37.164.35.154
JITSI_NAT_LOCAL_IP=192.168.0.18 JITSI_NAT_LOCAL_IP=192.168.0.231
JITSI_VIDEO_TCP=8080 JITSI_VIDEO_TCP=8080