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

---
 .gitignore                                     |  1 +
 docker/jitsi/01_gen_certs.yml                  |  8 ++++
 docker/jitsi/02_run.yml                        | 17 +++++++++
 docker/jitsi/README.md                         | 13 +++++--
 docker/jitsi/dev.env                           |  7 ++++
 docker/jitsi/docker-compose.yml                | 20 ----------
 docker/jitsi/jitsi-certs/.gitignore            |  2 +
 docker/jitsi/jitsi-conference-focus/Dockerfile | 22 +++++++++++
 docker/jitsi/jitsi-conference-focus/jicofo     |  8 ++++
 docker/jitsi/jitsi-videobridge/Dockerfile      | 15 ++++++++
 docker/jitsi/jitsi-xmpp/Dockerfile             |  8 ++--
 docker/jitsi/jitsi-xmpp/entrypoint.sh          | 52 --------------------------
 docker/jitsi/jitsi-xmpp/xmpp_conf              | 37 ++++++++++++++++++
 docker/jitsi/jitsi-xmpp/xmpp_gen               |  9 +++++
 docker/jitsi/jitsi-xmpp/xmpp_run               | 18 +++++++++
 15 files changed, 159 insertions(+), 78 deletions(-)
 create mode 100644 docker/jitsi/01_gen_certs.yml
 create mode 100644 docker/jitsi/02_run.yml
 create mode 100644 docker/jitsi/dev.env
 delete mode 100644 docker/jitsi/docker-compose.yml
 create mode 100644 docker/jitsi/jitsi-certs/.gitignore
 create mode 100755 docker/jitsi/jitsi-conference-focus/jicofo
 delete mode 100755 docker/jitsi/jitsi-xmpp/entrypoint.sh
 create mode 100755 docker/jitsi/jitsi-xmpp/xmpp_conf
 create mode 100755 docker/jitsi/jitsi-xmpp/xmpp_gen
 create mode 100755 docker/jitsi/jitsi-xmpp/xmpp_run

diff --git a/.gitignore b/.gitignore
index 55145d5..189f683 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.retry
 .git_old/
 debug/gladdrinfo
+*.swp
diff --git a/docker/jitsi/01_gen_certs.yml b/docker/jitsi/01_gen_certs.yml
new file mode 100644
index 0000000..8c97384
--- /dev/null
+++ b/docker/jitsi/01_gen_certs.yml
@@ -0,0 +1,8 @@
+version: '3'
+services:
+  jitsi-xmpp:
+    build: ./jitsi-xmpp
+    command: ["/usr/local/bin/xmpp_gen"]
+    volumes: [ './jitsi-certs/:/certs:rw' ]
+    env_file: [ 'dev.env' ]
+
diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml
new file mode 100644
index 0000000..f2ec9e9
--- /dev/null
+++ b/docker/jitsi/02_run.yml
@@ -0,0 +1,17 @@
+version: '3'
+services:
+  jitsi-xmpp:
+    build: ./jitsi-xmpp
+    ports:
+      - "5222:5222"
+      - "5347:5347"
+      - "5280:5280"
+    env_file: [ 'dev.env' ]
+  jitsi-front:
+    build: ./jitsi-front
+    ports:
+      - "80:80"
+    env_file: [ 'dev.env' ]
+  jitsi-conference-focus:
+    build: ./jitsi-conference-focus
+    env_file: [ 'dev.env' ]
diff --git a/docker/jitsi/README.md b/docker/jitsi/README.md
index 8ca8ec5..ea90274 100644
--- a/docker/jitsi/README.md
+++ b/docker/jitsi/README.md
@@ -3,11 +3,18 @@ This installation is inspired by: https://github.com/jitsi/jitsi-meet/blob/maste
 To build images:
 
 ```
-docker-compose build
+docker-compose -f 02_run.yml build
 ```
 
-To run stack:
+To gen the certs:
 
 ```
-docker-compose up --force-recreate
+docker-compose -f 01_gen_certs.yml up --force-recreate
+```
+
+To run the stack:
+
+
+```
+docker-compose -f 02_run.yml up --force-recreate
 ```
diff --git a/docker/jitsi/dev.env b/docker/jitsi/dev.env
new file mode 100644
index 0000000..6fe8ed1
--- /dev/null
+++ b/docker/jitsi/dev.env
@@ -0,0 +1,7 @@
+JITSI_SECRET_VIDEOBRIDGE=S3CR3T01
+JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02
+JITSI_SECRET_JICOFO_USER=S3CR3T03
+JITSI_PROSODY_BOSH_PORT=5280
+JITSI_PROSODY_BOSH_HOST=172.17.0.1
+JITSI_PROSODY_HOST=172.17.0.1
+JITSI_CERTS_FOLDER=/certs/
diff --git a/docker/jitsi/docker-compose.yml b/docker/jitsi/docker-compose.yml
deleted file mode 100644
index 2cc7e62..0000000
--- a/docker/jitsi/docker-compose.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: '2.0'
-services:
-  jitsi-xmpp:
-    build: ./jitsi-xmpp
-    ports:
-      - "5222:5222"
-      - "5347:5347"
-      - "5280:5280"
-    environment:
-      - JITSI_SECRET_VIDEOBRIDGE=S3CR3T01
-      - JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02
-      - JITSI_SECRET_JICOFO_USER=S3CR3T03
-  jitsi-front:
-    build: ./jitsi-front
-    ports:
-      - "80:80"
-    environment:
-      - JITSI_PROSODY_BOSH_PORT=5280
-      - JITSI_PROSODY_BOSH_HOST=172.17.0.1
-
diff --git a/docker/jitsi/jitsi-certs/.gitignore b/docker/jitsi/jitsi-certs/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/docker/jitsi/jitsi-certs/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
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}
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 
+
diff --git a/docker/jitsi/jitsi-xmpp/Dockerfile b/docker/jitsi/jitsi-xmpp/Dockerfile
index 4d71a13..3733d49 100644
--- a/docker/jitsi/jitsi-xmpp/Dockerfile
+++ b/docker/jitsi/jitsi-xmpp/Dockerfile
@@ -4,6 +4,8 @@ RUN apt-get update && \
     apt-get install -y prosody
 
 COPY external_components.cfg.lua /etc/prosody/conf.d/external_components.cfg.lua
-COPY entrypoint.sh /usr/local/bin/entrypoint
-ENTRYPOINT ["/usr/local/bin/entrypoint"]
-CMD ["/usr/bin/prosody"]
+COPY xmpp_conf /usr/local/bin/xmpp_conf
+COPY xmpp_gen /usr/local/bin/xmpp_gen
+COPY xmpp_run /usr/local/bin/xmpp_run
+
+CMD ["/usr/local/bin/xmpp_run"]
diff --git a/docker/jitsi/jitsi-xmpp/entrypoint.sh b/docker/jitsi/jitsi-xmpp/entrypoint.sh
deleted file mode 100755
index e6ab4e5..0000000
--- a/docker/jitsi/jitsi-xmpp/entrypoint.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-mkdir -p /etc/prosody/conf.{d,avail}/
-cat > /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua <<EOF
-VirtualHost "jitsi.deuxfleurs.fr"
-    authentication = "anonymous"
-    ssl = {
-        key = "/var/lib/prosody/jitsi.deuxfleurs.fr.key";
-        certificate = "/var/lib/prosody/jitsi.deuxfleurs.fr.crt";
-    }
-    modules_enabled = {
-        "bosh";
-        "pubsub";
-    }
-    c2s_require_encryption = false
-
-VirtualHost "auth.jitsi.deuxfleurs.fr"
-    ssl = {
-        key = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.key";
-        certificate = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.crt";
-    }
-    authentication = "internal_plain"
-
-admins = { "focus@auth.jitsi.deuxfleurs.fr" }
-
-Component "conference.jitsi.deuxfleurs.fr" "muc"
-Component "jitsi-videobridge.jitsi.deuxfleurs.fr"
-    component_secret = "${JITSI_SECRET_VIDEOBRIDGE}"
-Component "focus.jitsi.deuxfleurs.fr"
-    component_secret = "${JITSI_SECRET_JICOFO_COMPONENT}"
-EOF
-
-ln -sf \
-  /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua \
-  /etc/prosody/conf.d/jitsi.deuxfleurs.fr.cfg.lua
-
-prosodyctl cert generate jitsi.deuxfleurs.fr
-prosodyctl cert generate auth.jitsi.deuxfleurs.fr
-
-mkdir -p /usr/local/share/ca-certificates/
-ln -sf \
-  /var/lib/prosody/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}
-
-mkdir /run/prosody
-touch /run/prosody/prosody.pid
-chown -R prosody:prosody /run/prosody
-
-cd /var/lib/prosody
-su - prosody -s /bin/bash -c "$@"
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_conf b/docker/jitsi/jitsi-xmpp/xmpp_conf
new file mode 100755
index 0000000..c7534ba
--- /dev/null
+++ b/docker/jitsi/jitsi-xmpp/xmpp_conf
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+mkdir -p /etc/prosody/conf.{d,avail}/
+cat > /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua <<EOF
+VirtualHost "jitsi.deuxfleurs.fr"
+    authentication = "anonymous"
+    ssl = {
+        key = "/var/lib/prosody/jitsi.deuxfleurs.fr.key";
+        certificate = "/var/lib/prosody/jitsi.deuxfleurs.fr.crt";
+    }
+    modules_enabled = {
+        "bosh";
+        "pubsub";
+    }
+    c2s_require_encryption = false
+
+VirtualHost "auth.jitsi.deuxfleurs.fr"
+    ssl = {
+        key = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.key";
+        certificate = "/var/lib/prosody/auth.jitsi.deuxfleurs.fr.crt";
+    }
+    authentication = "internal_plain"
+
+admins = { "focus@auth.jitsi.deuxfleurs.fr" }
+
+Component "conference.jitsi.deuxfleurs.fr" "muc"
+Component "jitsi-videobridge.jitsi.deuxfleurs.fr"
+    component_secret = "${JITSI_SECRET_VIDEOBRIDGE}"
+Component "focus.jitsi.deuxfleurs.fr"
+    component_secret = "${JITSI_SECRET_JICOFO_COMPONENT}"
+EOF
+
+ln -sf \
+  /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua \
+  /etc/prosody/conf.d/jitsi.deuxfleurs.fr.cfg.lua
+
+
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_gen b/docker/jitsi/jitsi-xmpp/xmpp_gen
new file mode 100755
index 0000000..3a2e04a
--- /dev/null
+++ b/docker/jitsi/jitsi-xmpp/xmpp_gen
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+/usr/local/bin/xmpp_conf
+
+prosodyctl cert generate jitsi.deuxfleurs.fr
+prosodyctl cert generate auth.jitsi.deuxfleurs.fr
+
+cp /var/lib/prosody/*.crt ${JITSI_CERTS_FOLDER}
+cp /var/lib/prosody/*.key ${JITSI_CERTS_FOLDER}
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_run b/docker/jitsi/jitsi-xmpp/xmpp_run
new file mode 100755
index 0000000..ca2b7cf
--- /dev/null
+++ b/docker/jitsi/jitsi-xmpp/xmpp_run
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+/usr/local/bin/xmpp_conf
+cp ${JITSI_CERTS_FOLDER}/* /var/lib/prosody/
+
+mkdir -p /usr/local/share/ca-certificates/
+ln -sf \
+  /var/lib/prosody/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}
+
+mkdir /run/prosody
+touch /run/prosody/prosody.pid
+chown -R prosody:prosody /run/prosody
+
+cd /var/lib/prosody
+su - prosody -s /bin/bash -c prosody
-- 
cgit v1.2.3