aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-03-22 14:32:10 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-03-22 14:32:10 +0100
commitd2c743b7420b897116755d21fcd67630612a2b81 (patch)
tree2db4ddbf3362d71836b9ac788de322515190a8b0
parent3b92e1979d84e7202f82427a6e16585ffebb31a1 (diff)
downloadinfrastructure-d2c743b7420b897116755d21fcd67630612a2b81.tar.gz
infrastructure-d2c743b7420b897116755d21fcd67630612a2b81.zip
Move to a more manual jitsi installation
-rw-r--r--docker/jitsi/Dockerfile11
-rw-r--r--docker/jitsi/README.md1
-rw-r--r--docker/jitsi/jitsi-conference-focus/Dockerfile0
-rw-r--r--docker/jitsi/jitsi-front/Dockerfile0
-rw-r--r--docker/jitsi/jitsi-key.gpg.key51
-rw-r--r--docker/jitsi/jitsi-stable.list1
-rw-r--r--docker/jitsi/jitsi-videobridge/Dockerfile0
-rw-r--r--docker/jitsi/jitsi-xmpp/Dockerfile6
-rwxr-xr-xdocker/jitsi/jitsi-xmpp/entrypoint.sh46
9 files changed, 53 insertions, 63 deletions
diff --git a/docker/jitsi/Dockerfile b/docker/jitsi/Dockerfile
deleted file mode 100644
index af96be2..0000000
--- a/docker/jitsi/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM debian:buster
-
-RUN apt-get update && \
- apt-get install -y apt-transport-https gnupg2 ca-certificates
-
-COPY jitsi-stable.list /etc/apt/sources.list.d/jitsi-stable.list
-COPY jitsi-key.gpg.key /tmp/jitsi-key.gpg.key
-
-RUN apt-key add /tmp/jitsi-key.gpg.key && \
- apt-get update && \
- apt-get install -y jitsi-meet
diff --git a/docker/jitsi/README.md b/docker/jitsi/README.md
new file mode 100644
index 0000000..d18a85b
--- /dev/null
+++ b/docker/jitsi/README.md
@@ -0,0 +1 @@
+This installation is inspired by: https://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md
diff --git a/docker/jitsi/jitsi-conference-focus/Dockerfile b/docker/jitsi/jitsi-conference-focus/Dockerfile
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker/jitsi/jitsi-conference-focus/Dockerfile
diff --git a/docker/jitsi/jitsi-front/Dockerfile b/docker/jitsi/jitsi-front/Dockerfile
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker/jitsi/jitsi-front/Dockerfile
diff --git a/docker/jitsi/jitsi-key.gpg.key b/docker/jitsi/jitsi-key.gpg.key
deleted file mode 100644
index 5a78785..0000000
--- a/docker/jitsi/jitsi-key.gpg.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-=xG9N
------END PGP PUBLIC KEY BLOCK-----
diff --git a/docker/jitsi/jitsi-stable.list b/docker/jitsi/jitsi-stable.list
deleted file mode 100644
index 9a838c5..0000000
--- a/docker/jitsi/jitsi-stable.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://download.jitsi.org stable/
diff --git a/docker/jitsi/jitsi-videobridge/Dockerfile b/docker/jitsi/jitsi-videobridge/Dockerfile
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docker/jitsi/jitsi-videobridge/Dockerfile
diff --git a/docker/jitsi/jitsi-xmpp/Dockerfile b/docker/jitsi/jitsi-xmpp/Dockerfile
new file mode 100644
index 0000000..03bb8f3
--- /dev/null
+++ b/docker/jitsi/jitsi-xmpp/Dockerfile
@@ -0,0 +1,6 @@
+FROM debian:buster
+
+RUN apt-get update && \
+ apt-get install -y prosody
+
+
diff --git a/docker/jitsi/jitsi-xmpp/entrypoint.sh b/docker/jitsi/jitsi-xmpp/entrypoint.sh
new file mode 100755
index 0000000..017a756
--- /dev/null
+++ b/docker/jitsi/jitsi-xmpp/entrypoint.sh
@@ -0,0 +1,46 @@
+#!/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
+
+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}
+
+exec "$@"