From d2c743b7420b897116755d21fcd67630612a2b81 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Sun, 22 Mar 2020 14:32:10 +0100
Subject: Move to a more manual jitsi installation

---
 docker/jitsi/jitsi-videobridge/Dockerfile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docker/jitsi/jitsi-videobridge/Dockerfile

(limited to 'docker/jitsi/jitsi-videobridge')

diff --git a/docker/jitsi/jitsi-videobridge/Dockerfile b/docker/jitsi/jitsi-videobridge/Dockerfile
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3


From cef60898b5db0e314a435121606b04b1ad6ffbdd Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Sun, 22 Mar 2020 18:01:54 +0100
Subject: Rework jitsi-xmpp to support cert gen

---
 docker/jitsi/jitsi-videobridge/Dockerfile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'docker/jitsi/jitsi-videobridge')

diff --git a/docker/jitsi/jitsi-videobridge/Dockerfile b/docker/jitsi/jitsi-videobridge/Dockerfile
index e69de29..7216b8c 100644
--- a/docker/jitsi/jitsi-videobridge/Dockerfile
+++ b/docker/jitsi/jitsi-videobridge/Dockerfile
@@ -0,0 +1,15 @@
+FROM debian:buster AS builder
+
+RUN apt-get update && \
+    apt-get install -y wget unzip
+
+ENV VERSION=1132
+RUN wget https://download.jitsi.org/jitsi-videobridge/linux/jitsi-videobridge-linux-x64-${VERSION}.zip -O jvb.zip && \
+    unzip jvb.zip && \
+    mv jitsi-videobridge-linux-x64-${VERSION} jvb
+
+FROM debian:buster
+
+RUN apt-get update && \
+    apt-get install -y 
+
-- 
cgit v1.2.3


From 8fe3a046a480cf4ea8e19228d408265c279eeff9 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Sun, 22 Mar 2020 19:47:10 +0100
Subject: WIP videobridge

---
 docker/jitsi/jitsi-videobridge/Dockerfile |  8 +++++++-
 docker/jitsi/jitsi-videobridge/jvb_run    | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100755 docker/jitsi/jitsi-videobridge/jvb_run

(limited to 'docker/jitsi/jitsi-videobridge')

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}
-- 
cgit v1.2.3


From a95017cf1e1761fef1ec029105d1c25f954741d4 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Fri, 27 Mar 2020 09:02:49 +0100
Subject: Add tags and hostname

---
 docker/jitsi/jitsi-videobridge/jvb_run | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docker/jitsi/jitsi-videobridge')

diff --git a/docker/jitsi/jitsi-videobridge/jvb_run b/docker/jitsi/jitsi-videobridge/jvb_run
index dcd3cab..2431081 100755
--- a/docker/jitsi/jitsi-videobridge/jvb_run
+++ b/docker/jitsi/jitsi-videobridge/jvb_run
@@ -2,6 +2,7 @@
 
 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
+127.0.0.1 `hostname`
 EOF
 
 cd /srv/jvb
-- 
cgit v1.2.3