diff options
| -rw-r--r-- | docker/jitsi/02_run.yml | 8 | ||||
| -rw-r--r-- | docker/jitsi/dev.env | 2 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-conference-focus/jicofo | 4 | ||||
| -rw-r--r-- | docker/jitsi/jitsi-videobridge/Dockerfile | 8 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-videobridge/jvb_run | 22 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-xmpp/xmpp_conf | 4 |
6 files changed, 47 insertions, 1 deletions
diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml index 62c468d..297682c 100644 --- a/docker/jitsi/02_run.yml +++ b/docker/jitsi/02_run.yml @@ -18,3 +18,11 @@ services: build: ./jitsi-conference-focus env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] + jitsi-videobridge: + build: ./jitsi-videobridge + ports: + - "4443:4443" + - "10000:10000/udp" + env_file: [ 'dev.env' ] + volumes: [ './jitsi-certs/:/certs:ro' ] + diff --git a/docker/jitsi/dev.env b/docker/jitsi/dev.env index 6fe8ed1..cebe2a7 100644 --- a/docker/jitsi/dev.env +++ b/docker/jitsi/dev.env @@ -5,3 +5,5 @@ JITSI_PROSODY_BOSH_PORT=5280 JITSI_PROSODY_BOSH_HOST=172.17.0.1 JITSI_PROSODY_HOST=172.17.0.1 JITSI_CERTS_FOLDER=/certs/ +JITSI_NAT_PUBLIC_IP=77.204.7.239 +JITSI_NAT_LOCAL_IP=192.168.0.18 diff --git a/docker/jitsi/jitsi-conference-focus/jicofo b/docker/jitsi/jitsi-conference-focus/jicofo index 30fc870..88ea76c 100755 --- a/docker/jitsi/jitsi-conference-focus/jicofo +++ b/docker/jitsi/jitsi-conference-focus/jicofo @@ -3,6 +3,10 @@ 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 <<EOF +${JITSI_PROSODY_HOST} jitsi.deuxfleurs.fr conference.jitsi.deuxfleurs.fr jitsi-videobridge.jitsi.deuxfleurs.fr focus.jitsi.deuxfleurs.fr auth.jitsi.deuxfleurs.fr +EOF + /srv/jicofo/jicofo.sh \ --host=${JITSI_PROSODY_HOST} \ --domain=jitsi.deuxfleurs.fr \ diff --git a/docker/jitsi/jitsi-videobridge/Dockerfile b/docker/jitsi/jitsi-videobridge/Dockerfile index 7216b8c..e34d000 100644 --- a/docker/jitsi/jitsi-videobridge/Dockerfile +++ b/docker/jitsi/jitsi-videobridge/Dockerfile @@ -11,5 +11,11 @@ RUN wget https://download.jitsi.org/jitsi-videobridge/linux/jitsi-videobridge-li FROM debian:buster RUN apt-get update && \ - apt-get install -y + apt-get install -y openjdk-11-jdk +COPY --from=builder /jvb /srv/jvb +ENV HOME=/srv/jvb +WORKDIR /srv/jvb +COPY jvb_run /usr/local/bin/jvb_run + +CMD ["/usr/local/bin/jvb_run"] diff --git a/docker/jitsi/jitsi-videobridge/jvb_run b/docker/jitsi/jitsi-videobridge/jvb_run new file mode 100755 index 0000000..dcd3cab --- /dev/null +++ b/docker/jitsi/jitsi-videobridge/jvb_run @@ -0,0 +1,22 @@ +#!/bin/bash + +cat >> /etc/hosts <<EOF +${JITSI_PROSODY_HOST} jitsi.deuxfleurs.fr conference.jitsi.deuxfleurs.fr jitsi-videobridge.jitsi.deuxfleurs.fr focus.jitsi.deuxfleurs.fr auth.jitsi.deuxfleurs.fr +EOF + +cd /srv/jvb + +cat > ~/.sip-communicator/sip-communicator.properties <<EOF +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 +org.jitsi.videobridge.TCP_HARVESTER_PORT=4443 +org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP} +org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP} +EOF + +./jvb.sh \ + --host=${JITSI_PROSODY_HOST} \ + --domain=jitsi.deuxfleurs.fr \ + --port=5347 \ + --secret=${JITSI_SECRET_VIDEOBRIDGE} diff --git a/docker/jitsi/jitsi-xmpp/xmpp_conf b/docker/jitsi/jitsi-xmpp/xmpp_conf index c7534ba..5ab4a20 100755 --- a/docker/jitsi/jitsi-xmpp/xmpp_conf +++ b/docker/jitsi/jitsi-xmpp/xmpp_conf @@ -1,5 +1,9 @@ #!/bin/bash +cat >> /etc/hosts <<EOF +${JITSI_PROSODY_HOST} jitsi.deuxfleurs.fr conference.jitsi.deuxfleurs.fr jitsi-videobridge.jitsi.deuxfleurs.fr focus.jitsi.deuxfleurs.fr auth.jitsi.deuxfleurs.fr +EOF + mkdir -p /etc/prosody/conf.{d,avail}/ cat > /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua <<EOF VirtualHost "jitsi.deuxfleurs.fr" |