aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2024-09-12 19:59:51 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2024-09-12 20:00:09 +0200
commit8ca33f31366dbbbb37c9bea54ac4fc47d3122fae (patch)
tree57726fde2a08889abdaea9212a96988f54b87349
parent9742ec34dae347a244dde6fd809b5fad300443a2 (diff)
downloadnixcfg-8ca33f31366dbbbb37c9bea54ac4fc47d3122fae.tar.gz
nixcfg-8ca33f31366dbbbb37c9bea54ac4fc47d3122fae.zip
ready to deploy jitsi
-rwxr-xr-xcluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run2
-rw-r--r--cluster/prod/app/jitsi/deploy/jitsi.hcl8
-rw-r--r--cluster/prod/app/jitsi/integration/README.md2
-rw-r--r--cluster/prod/app/jitsi/integration/docker-compose.yml11
-rw-r--r--cluster/prod/app/jitsi/integration/jvb/videobridge.conf2
-rw-r--r--cluster/prod/app/jitsi/integration/meet/config.js2
6 files changed, 15 insertions, 12 deletions
diff --git a/cluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run b/cluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run
index 8d595e6..f136eff 100755
--- a/cluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run
+++ b/cluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run
@@ -6,7 +6,7 @@ if [ -z "${JITSI_NAT_LOCAL_IP}" ]; then
fi
if [ -z "${JITSI_NAT_PUBLIC_IP}" ]; then
- JITSI_NAT_PUBLIC_IP=$(curl https://ifconfig.me)
+ JITSI_NAT_PUBLIC_IP=$(curl -4 https://ifconfig.me)
fi
echo "NAT config: ${JITSI_NAT_LOCAL_IP} -> ${JITSI_NAT_PUBLIC_IP}"
diff --git a/cluster/prod/app/jitsi/deploy/jitsi.hcl b/cluster/prod/app/jitsi/deploy/jitsi.hcl
index 66fec76..7b78bdc 100644
--- a/cluster/prod/app/jitsi/deploy/jitsi.hcl
+++ b/cluster/prod/app/jitsi/deploy/jitsi.hcl
@@ -20,7 +20,7 @@ job "jitsi" {
task "xmpp" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_xmpp:v11"
+ image = "superboum/amd64_jitsi_xmpp:v12"
ports = [ "bosh_port", "xmpp_port" ]
network_mode = "host"
volumes = [
@@ -101,7 +101,7 @@ EOF
task "front" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_meet:v6"
+ image = "superboum/amd64_jitsi_meet:v7"
network_mode = "host"
ports = [ "https_port" ]
volumes = [
@@ -168,7 +168,7 @@ EOF
task "jicofo" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_conference_focus:v10"
+ image = "superboum/amd64_jitsi_conference_focus:v11"
network_mode = "host"
volumes = [
"secrets/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt",
@@ -208,7 +208,7 @@ EOF
task "videobridge" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_videobridge:v21"
+ image = "superboum/amd64_jitsi_videobridge:v22"
network_mode = "host"
ports = [ "video_port" ]
ulimit {
diff --git a/cluster/prod/app/jitsi/integration/README.md b/cluster/prod/app/jitsi/integration/README.md
index b45cd17..adf9526 100644
--- a/cluster/prod/app/jitsi/integration/README.md
+++ b/cluster/prod/app/jitsi/integration/README.md
@@ -52,7 +52,7 @@ But maybe this value is deprecated: the check is still here but it is not used a
start a maintainance container
```
-docker run --rm -it -v `pwd`/prosody/certs/:/var/lib/prosody/ -v `pwd`/prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro --user root superboum/amd64_jitsi_xmpp:v11 bash
+docker run --rm -it -v `pwd`/prosody/certs/:/var/lib/prosody/ -v `pwd`/prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro --user root superboum/amd64_jitsi_xmpp:v12 bash
```
then generate certificates from inside this container
diff --git a/cluster/prod/app/jitsi/integration/docker-compose.yml b/cluster/prod/app/jitsi/integration/docker-compose.yml
index 5e34467..1a12ee5 100644
--- a/cluster/prod/app/jitsi/integration/docker-compose.yml
+++ b/cluster/prod/app/jitsi/integration/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.4'
services:
jitsi-xmpp:
- image: superboum/amd64_jitsi_xmpp:v11
+ image: superboum/amd64_jitsi_xmpp:v12
volumes:
- "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro"
- "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt:ro"
@@ -11,16 +11,19 @@ services:
environment:
- JICOFO_AUTH_PASSWORD=jicofopass
- JVB_AUTH_PASSWORD=jvbpass
+ ports:
+ - "5222:5222/tcp"
jitsi-conference-focus:
- image: superboum/amd64_jitsi_conference_focus:v10
+ image: superboum/amd64_jitsi_conference_focus:v11
volumes:
- "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
- "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
- "./jicofo/jicofo.conf:/etc/jitsi/jicofo.conf:ro"
jitsi-videobridge:
- image: superboum/amd64_jitsi_videobridge:v21
+ image: superboum/amd64_jitsi_videobridge:v22
+ network_mode: "host"
volumes:
- "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
- "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
@@ -31,7 +34,7 @@ services:
- "10000:10000/udp"
jitsi-meet:
- image: superboum/amd64_jitsi_meet:v6
+ image: superboum/amd64_jitsi_meet:v7
volumes:
- "./prosody/certs/jitsi.crt:/etc/nginx/jitsi.crt:ro"
- "./prosody/certs/jitsi.key:/etc/nginx/jitsi.key:ro"
diff --git a/cluster/prod/app/jitsi/integration/jvb/videobridge.conf b/cluster/prod/app/jitsi/integration/jvb/videobridge.conf
index a11edc6..dd6778b 100644
--- a/cluster/prod/app/jitsi/integration/jvb/videobridge.conf
+++ b/cluster/prod/app/jitsi/integration/jvb/videobridge.conf
@@ -62,7 +62,7 @@ videobridge {
configs {
unique-xmpp-server {
- hostname="jitsi-xmpp"
+ hostname="172.17.0.1"
domain = "auth.jitsi"
username = "jvb"
password = "jvbpass"
diff --git a/cluster/prod/app/jitsi/integration/meet/config.js b/cluster/prod/app/jitsi/integration/meet/config.js
index 97c5d4d..1ef9501 100644
--- a/cluster/prod/app/jitsi/integration/meet/config.js
+++ b/cluster/prod/app/jitsi/integration/meet/config.js
@@ -22,7 +22,7 @@ var config = {
},
// BOSH URL. FIXME: use XEP-0156 to discover it.
- bosh: '//192.168.1.143/http-bind',
+ bosh: '//[2a0c:e303:0:2a00::de6]/http-bind',
// Websocket URL
// websocket: 'wss://jitsi-meet.example.com/xmpp-websocket',