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-conference-focus/Dockerfile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docker/jitsi/jitsi-conference-focus/Dockerfile

(limited to 'docker/jitsi/jitsi-conference-focus')

diff --git a/docker/jitsi/jitsi-conference-focus/Dockerfile b/docker/jitsi/jitsi-conference-focus/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-conference-focus/Dockerfile | 22 ++++++++++++++++++++++
 docker/jitsi/jitsi-conference-focus/jicofo     |  8 ++++++++
 2 files changed, 30 insertions(+)
 create mode 100755 docker/jitsi/jitsi-conference-focus/jicofo

(limited to 'docker/jitsi/jitsi-conference-focus')

diff --git a/docker/jitsi/jitsi-conference-focus/Dockerfile b/docker/jitsi/jitsi-conference-focus/Dockerfile
index e69de29..7933ed9 100644
--- a/docker/jitsi/jitsi-conference-focus/Dockerfile
+++ b/docker/jitsi/jitsi-conference-focus/Dockerfile
@@ -0,0 +1,22 @@
+FROM debian:buster AS builder
+
+RUN apt-get update && \
+    apt-get install -y openjdk-11-jdk maven git unzip && \
+    git clone --depth=1 https://github.com/jitsi/jicofo.git && \
+    cd jicofo && \
+    mvn package -DskipTests -Dassembly.skipAssembly=false
+
+RUN cd jicofo && \
+    unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \
+    mv jicofo-1.1-SNAPSHOT /srv/jicofo
+
+
+FROM debian:buster
+
+RUN apt-get update && \
+    apt-get install -y openjdk-11-jdk
+
+COPY --from=builder /srv/jicofo /srv/jicofo
+COPY jicofo /usr/local/bin/jicofo
+
+CMD ["/usr/local/bin/jicofo"]
diff --git a/docker/jitsi/jitsi-conference-focus/jicofo b/docker/jitsi/jitsi-conference-focus/jicofo
new file mode 100755
index 0000000..34b5548
--- /dev/null
+++ b/docker/jitsi/jitsi-conference-focus/jicofo
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+/srv/jicofo/jicofo.sh \
+  --host=${JITSI_PROSODY_HOST} \
+  --domain=jitsi.deuxfleurs.fr \
+  --secret=${JITSI_SECRET_JICOFO_COMPONENT} \
+  --user_domain=auth.jitsi.deuxfleurs.fr \
+  --user_password=${JITSI_SECRET_JICOFO_USER}
-- 
cgit v1.2.3


From 51b656e937aa469e8f09a43bd51dbdabdd4eea1f Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Sun, 22 Mar 2020 18:14:16 +0100
Subject: jicofo seems to work

---
 docker/jitsi/jitsi-conference-focus/Dockerfile | 2 +-
 docker/jitsi/jitsi-conference-focus/jicofo     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'docker/jitsi/jitsi-conference-focus')

diff --git a/docker/jitsi/jitsi-conference-focus/Dockerfile b/docker/jitsi/jitsi-conference-focus/Dockerfile
index 7933ed9..190010e 100644
--- a/docker/jitsi/jitsi-conference-focus/Dockerfile
+++ b/docker/jitsi/jitsi-conference-focus/Dockerfile
@@ -14,7 +14,7 @@ RUN cd jicofo && \
 FROM debian:buster
 
 RUN apt-get update && \
-    apt-get install -y openjdk-11-jdk
+    apt-get install -y openjdk-11-jdk ca-certificates
 
 COPY --from=builder /srv/jicofo /srv/jicofo
 COPY jicofo /usr/local/bin/jicofo
diff --git a/docker/jitsi/jitsi-conference-focus/jicofo b/docker/jitsi/jitsi-conference-focus/jicofo
index 34b5548..30fc870 100755
--- a/docker/jitsi/jitsi-conference-focus/jicofo
+++ b/docker/jitsi/jitsi-conference-focus/jicofo
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+cp ${JITSI_CERTS_FOLDER}/auth.jitsi.deuxfleurs.fr.crt /usr/local/share/ca-certificates/auth.jitsi.deuxfleurs.fr.crt
+update-ca-certificates -f
+
 /srv/jicofo/jicofo.sh \
   --host=${JITSI_PROSODY_HOST} \
   --domain=jitsi.deuxfleurs.fr \
-- 
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-conference-focus/jicofo | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docker/jitsi/jitsi-conference-focus')

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 \
-- 
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-conference-focus/jicofo | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docker/jitsi/jitsi-conference-focus')

diff --git a/docker/jitsi/jitsi-conference-focus/jicofo b/docker/jitsi/jitsi-conference-focus/jicofo
index 88ea76c..2bc6e3f 100755
--- a/docker/jitsi/jitsi-conference-focus/jicofo
+++ b/docker/jitsi/jitsi-conference-focus/jicofo
@@ -5,6 +5,7 @@ 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
+127.0.0.1 `hostname`
 EOF
 
 /srv/jicofo/jicofo.sh \
-- 
cgit v1.2.3