infra
/
tf
2
0
Fork 0
Code Pull Requests Activity

jitsi: fix video bridge connection, 

use websockets
This commit is contained in:
Jan Koppe 2024-01-27 09:30:30 +01:00
parent 2e3253aab6
commit 6033ca423e
Signed by: thunfisch
GPG Key ID: BE935B0735A2129B
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/swarm/jitsi/jitsi_jvb.tf
View File

@ -2,12 +2,26 @@ data "docker_registry_image" "jitsi_jvb" {
name = "jitsi/jvb:stable" name = "jitsi/jvb:stable"
} }
locals {
labels_jvb = {
"shepherd.auto-update" = "true",
"traefik.enable" = "true"
"traefik.http.services.jitsi-jvb.loadbalancer.server.port" = "9090",
"traefik.http.routers.jitsi-jvb.rule" = "Host(`talk.chaoswest.tv`)&&PathPrefix(`/colibri-ws`)",
"traefik.http.routers.jitsi-jvb.tls" = "true",
"traefik.http.routers.jitsi-jvb.tls.certresolver" = "default",
}
}
resource "docker_service" "jitsi_jvb" { resource "docker_service" "jitsi_jvb" {
name = "jitsi_jvb" name = "jitsi_jvb"
labels { dynamic "labels" {
label = "shepherd.auto-update" for_each = local.labels_jvb
value = "true" content {
label = labels.key
value = labels.value
}
} }
endpoint_spec { endpoint_spec {
@ -27,6 +41,10 @@ resource "docker_service" "jitsi_jvb" {
} }
task_spec { task_spec {
networks_advanced {
name = data.docker_network.traefik.id
}
networks_advanced { networks_advanced {
name = docker_network.jitsi.id name = docker_network.jitsi.id
} }
@ -43,12 +61,13 @@ resource "docker_service" "jitsi_jvb" {
JVB_TCP_HARVESTER_DISABLED = "true" JVB_TCP_HARVESTER_DISABLED = "true"
JVB_TCP_PORT = "4443" JVB_TCP_PORT = "4443"
JVB_TCP_MAPPED_PORT = "4443" JVB_TCP_MAPPED_PORT = "4443"
JVB_STUN_SERVERS = "meet-jit-si-turnrelay.jitsi.net:443"
PUBLIC_URL = "https://talk.chaoswest.tv" PUBLIC_URL = "https://talk.chaoswest.tv"
TZ = "Europe/Berlin" TZ = "Europe/Berlin"
XMPP_AUTH_DOMAIN = "auth.meet.jitsi" XMPP_AUTH_DOMAIN = "auth.meet.jitsi"
XMPP_INTERNAL_MUC_DOMAIN = "internal-muc.meet.jitsi" XMPP_INTERNAL_MUC_DOMAIN = "internal-muc.meet.jitsi"
XMPP_SERVER = "jitsi_prosody" XMPP_SERVER = "jitsi_prosody"
JVB_WS_SERVER_ID = "jitsi_jvb"
JVB_DISABLE_STUN = "1"
} }
} }
} }

2
modules/swarm/jitsi/jitsi_prosody.tf
View File

@ -7,7 +7,7 @@ locals {
"shepherd.auto-update" = "true", "shepherd.auto-update" = "true",
"traefik.enable" = "true" "traefik.enable" = "true"
"traefik.http.services.jitsi-prosody.loadbalancer.server.port" = "5280", "traefik.http.services.jitsi-prosody.loadbalancer.server.port" = "5280",
"traefik.http.routers.jitsi-prosody.rule" = "Host(`talk.chaoswest.tv`)&&Path(`/room-census`)", "traefik.http.routers.jitsi-prosody.rule" = "Host(`talk.chaoswest.tv`)&&(Path(`/room-census`)||Path(`/xmpp-websocket`))",
"traefik.http.routers.jitsi-prosody.tls" = "true", "traefik.http.routers.jitsi-prosody.tls" = "true",
"traefik.http.routers.jitsi-prosody.tls.certresolver" = "default", "traefik.http.routers.jitsi-prosody.tls.certresolver" = "default",
} }

2
modules/swarm/jitsi/jitsi_web.tf
View File

@ -7,7 +7,7 @@ locals {
"shepherd.auto-update" = "true", "shepherd.auto-update" = "true",
"traefik.enable" = "true" "traefik.enable" = "true"
"traefik.http.services.jitsi-web.loadbalancer.server.port" = "80", "traefik.http.services.jitsi-web.loadbalancer.server.port" = "80",
"traefik.http.routers.jitsi-web.rule" = "Host(`talk.chaoswest.tv`)&&!Path(`/room-census`)", "traefik.http.routers.jitsi-web.rule" = "Host(`talk.chaoswest.tv`)&&!(Path(`/room-census`)||Path(`/xmpp-websocket`)||PathPrefix(`/colibri-ws`))",
"traefik.http.routers.jitsi-web.tls" = "true", "traefik.http.routers.jitsi-web.tls" = "true",
"traefik.http.routers.jitsi-web.tls.certresolver" = "default", "traefik.http.routers.jitsi-web.tls.certresolver" = "default",
} }