From a23e08ce20887efb4e158a02ffee1f775a0db89f Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Sat, 12 Sep 2020 20:17:07 +0200
Subject: Refactor 2

---
 app/build/jitsi-xmpp/Dockerfile                  | 11 +++++++
 app/build/jitsi-xmpp/external_components.cfg.lua |  2 ++
 app/build/jitsi-xmpp/xmpp_conf                   | 42 ++++++++++++++++++++++++
 app/build/jitsi-xmpp/xmpp_gen                    |  9 +++++
 app/build/jitsi-xmpp/xmpp_run                    | 19 +++++++++++
 5 files changed, 83 insertions(+)
 create mode 100644 app/build/jitsi-xmpp/Dockerfile
 create mode 100644 app/build/jitsi-xmpp/external_components.cfg.lua
 create mode 100755 app/build/jitsi-xmpp/xmpp_conf
 create mode 100755 app/build/jitsi-xmpp/xmpp_gen
 create mode 100755 app/build/jitsi-xmpp/xmpp_run

(limited to 'app/build/jitsi-xmpp')

diff --git a/app/build/jitsi-xmpp/Dockerfile b/app/build/jitsi-xmpp/Dockerfile
new file mode 100644
index 0000000..3733d49
--- /dev/null
+++ b/app/build/jitsi-xmpp/Dockerfile
@@ -0,0 +1,11 @@
+FROM debian:buster
+
+RUN apt-get update && \
+    apt-get install -y prosody
+
+COPY external_components.cfg.lua /etc/prosody/conf.d/external_components.cfg.lua
+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/app/build/jitsi-xmpp/external_components.cfg.lua b/app/build/jitsi-xmpp/external_components.cfg.lua
new file mode 100644
index 0000000..beaaa87
--- /dev/null
+++ b/app/build/jitsi-xmpp/external_components.cfg.lua
@@ -0,0 +1,2 @@
+component_ports = { 5347 }
+component_interface = "0.0.0.0"
diff --git a/app/build/jitsi-xmpp/xmpp_conf b/app/build/jitsi-xmpp/xmpp_conf
new file mode 100755
index 0000000..2a9278e
--- /dev/null
+++ b/app/build/jitsi-xmpp/xmpp_conf
@@ -0,0 +1,42 @@
+#!/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
+127.0.0.1 `hostname`
+EOF
+
+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/app/build/jitsi-xmpp/xmpp_gen b/app/build/jitsi-xmpp/xmpp_gen
new file mode 100755
index 0000000..3a2e04a
--- /dev/null
+++ b/app/build/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/app/build/jitsi-xmpp/xmpp_run b/app/build/jitsi-xmpp/xmpp_run
new file mode 100755
index 0000000..8dfdf86
--- /dev/null
+++ b/app/build/jitsi-xmpp/xmpp_run
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+/usr/local/bin/xmpp_conf
+cp ${JITSI_CERTS_FOLDER}/* /var/lib/prosody/
+chown -R prosody:prosody /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


From da034dabfcedcded964b6022153cf5a8a7ae9380 Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Sun, 13 Sep 2020 11:46:14 +0200
Subject: Finally it seems to work

---
 app/build/jitsi-xmpp/xmpp_conf | 39 ++++++++++++++++++++++-----------------
 app/build/jitsi-xmpp/xmpp_run  |  1 +
 2 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'app/build/jitsi-xmpp')

diff --git a/app/build/jitsi-xmpp/xmpp_conf b/app/build/jitsi-xmpp/xmpp_conf
index 2a9278e..5990d07 100755
--- a/app/build/jitsi-xmpp/xmpp_conf
+++ b/app/build/jitsi-xmpp/xmpp_conf
@@ -8,31 +8,36 @@ EOF
 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
+  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" }
+  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 "internal.auth.jitsi.deuxfleurs.fr" "muc"
+  storage = "memory"
+  modules_enabled = { "ping"; }
+  admins = { "focus@auth.jitsi.deuxfleurs.fr", "jvb@auth.jitsi.deuxfleurs.fr" }
+
 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 \
diff --git a/app/build/jitsi-xmpp/xmpp_run b/app/build/jitsi-xmpp/xmpp_run
index 8dfdf86..6383b65 100755
--- a/app/build/jitsi-xmpp/xmpp_run
+++ b/app/build/jitsi-xmpp/xmpp_run
@@ -10,6 +10,7 @@ ln -sf \
   /usr/local/share/ca-certificates/auth.jitsi.deuxfleurs.fr.crt
 
 prosodyctl register focus auth.jitsi.deuxfleurs.fr ${JITSI_SECRET_JICOFO_USER}
+prosodyctl register jvb auth.jitsi.deuxfleurs.fr ${JITSI_SECRET_VIDEOBRIDGE}
 
 mkdir /run/prosody
 touch /run/prosody/prosody.pid
-- 
cgit v1.2.3