aboutsummaryrefslogtreecommitdiff
path: root/app/jitsi/integration
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-01-28 18:55:56 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-01-28 18:55:56 +0100
commit4809e27220d4805bce8f14585f902097f53607ee (patch)
tree88f3089023ca73dff5a79c97c5a019a58b9f8e95 /app/jitsi/integration
parent7b57ff72a918ca295e2b00e76da33eec700c6a2a (diff)
downloadinfrastructure-4809e27220d4805bce8f14585f902097f53607ee.tar.gz
infrastructure-4809e27220d4805bce8f14585f902097f53607ee.zip
WIP integration jitsi
Diffstat (limited to 'app/jitsi/integration')
-rw-r--r--app/jitsi/integration/01_gen_certs.yml8
-rw-r--r--app/jitsi/integration/02_run.yml27
-rw-r--r--app/jitsi/integration/README.md6
-rw-r--r--app/jitsi/integration/docker-compose.yml22
-rw-r--r--app/jitsi/integration/prosody/accounts.txt2
-rw-r--r--app/jitsi/integration/prosody/prosody.cfg.lua49
6 files changed, 69 insertions, 45 deletions
diff --git a/app/jitsi/integration/01_gen_certs.yml b/app/jitsi/integration/01_gen_certs.yml
deleted file mode 100644
index bf73291..0000000
--- a/app/jitsi/integration/01_gen_certs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: '3'
-services:
- jitsi-xmpp:
- image: superboum/amd64_jitsi_xmpp:v2
- command: ["/usr/local/bin/xmpp_gen"]
- volumes: [ './jitsi-certs/:/certs:rw' ]
- env_file: [ 'dev.env' ]
-
diff --git a/app/jitsi/integration/02_run.yml b/app/jitsi/integration/02_run.yml
deleted file mode 100644
index 73eefad..0000000
--- a/app/jitsi/integration/02_run.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: '3.4'
-services:
- jitsi-xmpp:
- image: superboum/amd64_jitsi_xmpp:v3
- ports:
- - "5222:5222"
- - "5347:5347"
- - "5280:5280"
- env_file: [ 'dev.env' ]
- volumes: [ './jitsi-certs/:/certs:ro' ]
- jitsi-meet:
- image: superboum/amd64_jitsi_meet:v1
- ports:
- - "443:443"
- env_file: [ 'dev.env' ]
- volumes: [ './jitsi-certs/:/certs:ro' ]
- jitsi-conference-focus:
- image: superboum/amd64_jitsi_conference_focus:v4
- env_file: [ 'dev.env' ]
- volumes: [ './jitsi-certs/:/certs:ro' ]
- jitsi-videobridge:
- image: superboum/amd64_jitsi_videobridge:v14
- ports:
- - "8080:8080/tcp"
- - "10000:10000/udp"
- env_file: [ 'dev.env' ]
- volumes: [ './jitsi-certs/:/certs:ro' ]
diff --git a/app/jitsi/integration/README.md b/app/jitsi/integration/README.md
index e295745..d2d25c1 100644
--- a/app/jitsi/integration/README.md
+++ b/app/jitsi/integration/README.md
@@ -46,6 +46,12 @@ But we can see this is a deprecated thing, it has been already removed from mast
For now (as per v5390) we will keep `JICOFO_SECRET` environment variable but will assume no other environment variable is set
But maybe this value is deprecated: the check is still here but it is not used anymore?!
+## Generate certs with prosody
+```
+prosodyctl cert generate auth.jitsi
+prosodyctl cert generate jitsi
+```
+
## Resources to understand jitsi
- [jicofo/debian/postinst](https://github.com/jitsi/jicofo/blob/master/debian/postinst)
diff --git a/app/jitsi/integration/docker-compose.yml b/app/jitsi/integration/docker-compose.yml
new file mode 100644
index 0000000..0a4012a
--- /dev/null
+++ b/app/jitsi/integration/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '3.4'
+services:
+ jitsi-xmpp:
+ image: superboum/amd64_jitsi_xmpp:v9
+ volumes:
+ - "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua"
+ - "./prosody/accounts.txt:/etc/prosody/accounts.txt"
+ - "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt"
+ - "./prosody/certs/jitsi.key:/var/lib/prosody/jitsi.key"
+ - "./prosody/certs/auth.jitsi.crt:/var/lib/prosody/auth.jitsi.crt"
+ - "./prosody/certs/auth.jitsi.key:/var/lib/prosody/auth.jitsi.key"
+ jitsi-meet:
+ image: superboum/amd64_jitsi_meet:v1
+ ports:
+ - "443:443"
+ jitsi-conference-focus:
+ image: superboum/amd64_jitsi_conference_focus:v4
+ jitsi-videobridge:
+ image: superboum/amd64_jitsi_videobridge:v14
+ ports:
+ - "8080:8080/tcp"
+ - "10000:10000/udp"
diff --git a/app/jitsi/integration/prosody/accounts.txt b/app/jitsi/integration/prosody/accounts.txt
new file mode 100644
index 0000000..ef4f2cd
--- /dev/null
+++ b/app/jitsi/integration/prosody/accounts.txt
@@ -0,0 +1,2 @@
+focus auth.jitsi xxx
+jvb auth.jitsi yyy
diff --git a/app/jitsi/integration/prosody/prosody.cfg.lua b/app/jitsi/integration/prosody/prosody.cfg.lua
index edfd820..5f18e2a 100644
--- a/app/jitsi/integration/prosody/prosody.cfg.lua
+++ b/app/jitsi/integration/prosody/prosody.cfg.lua
@@ -1,12 +1,41 @@
-component_ports = { 5347 }
+daemonize = false
+allow_registration = false
+use_libevent = true
component_interface = "0.0.0.0"
-http_ports = { ${JITSI_PROSODY_BOSH_PORT} }
+component_ports = { 5347 }
+http_ports = { 5280 }
+
+-- Not sure all modules are required
+modules_enabled = {
+ "roster"; -- Allow users to have a roster. Recommended ;)
+ "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+ "tls"; -- Add support for secure TLS on c2s/s2s connections
+ "dialback"; -- s2s dialback support
+ "disco"; -- Service discovery
+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+ "compression"; -- Stream compression (requires the lua-zlib package installed)
+ "version"; -- Replies to server version requests
+ "uptime"; -- Report how long server has been running
+ "time"; -- Let others know the time here on this server
+ "ping"; -- Replies to XMPP pings with pongs
+ "pep"; -- Enables users to publish their mood, activity, playing music and more
+ -- jitsi
+ "smacks";
+ "carbons";
+ "mam";
+ "lastactivity";
+ "offline";
+ "pubsub";
+ "adhoc";
+ "websocket";
+ "http_altconnect";
+}
+
log = {
- error="/dev/stderr"
- info="/dev/stdout"
+ "*console";
}
-VirtualHost "jitsi.deuxfleurs.fr"
+VirtualHost "jitsi"
authentication = "anonymous"
ssl = {
key = "/var/lib/prosody/jitsi.key";
@@ -18,17 +47,17 @@ VirtualHost "jitsi.deuxfleurs.fr"
}
c2s_require_encryption = false
-VirtualHost "auth.jitsi.deuxfleurs.fr"
+VirtualHost "auth.jitsi"
ssl = {
key = "/var/lib/prosody/auth.jitsi.key";
certificate = "/var/lib/prosody/auth.jitsi.crt";
}
authentication = "internal_plain"
- admins = { "focus@auth.jitsi.deuxfleurs.fr"}
+ admins = { "focus@auth.jitsi"}
-Component "conference.jitsi.deuxfleurs.fr" "muc"
-Component "internal.auth.jitsi.deuxfleurs.fr" "muc"
+Component "conference.jitsi" "muc"
+Component "internal.auth.jitsi" "muc"
storage = "memory"
modules_enabled = { "ping"; }
- admins = { "focus@auth.jitsi.deuxfleurs.fr", "jvb@auth.jitsi.deuxfleurs.fr" }
+ admins = { "focus@auth.jitsi", "jvb@auth.jitsi" }