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-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 ++++++++++++
 5 files changed, 69 insertions(+), 55 deletions(-)
 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

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

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