Deuxfleurs/infrastructure
Archived
24
2
Fork 2
Code Issues 22 Pull requests Projects 1 Releases Wiki Activity

Fix videobridge

Browse source
This commit is contained in:
Quentin 2020-09-12 22:18:30 +02:00
parent 51e4af08c0
commit 1af6eabc81
5 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build/docker-compose.yml
View file

@ -53,7 +53,7 @@ services:
# https://github.com/jitsi/jitsi-videobridge # https://github.com/jitsi/jitsi-videobridge
PREFIXV: stable/jitsi-meet_ PREFIXV: stable/jitsi-meet_
VERSION: 4966 VERSION: 4966
image: superboum/amd64_jitsi_videobridge:v10 image: superboum/amd64_jitsi_videobridge:v11
jitsi-xmpp: jitsi-xmpp:
build: build:

3
app/build/jitsi-videobridge/jvb_run
View file

@ -35,4 +35,5 @@ EOF
--host=${JITSI_PROSODY_HOST} \ --host=${JITSI_PROSODY_HOST} \
--domain=jitsi.deuxfleurs.fr \ --domain=jitsi.deuxfleurs.fr \
--port=5347 \ --port=5347 \
--secret=${JITSI_SECRET_VIDEOBRIDGE} --secret=${JITSI_SECRET_VIDEOBRIDGE} \
--apis=rest,xmpp

14
app/deployment/jitsi.hcl
View file

@ -1,9 +1,3 @@
/*
* WIP WIP WIP WIP
*
* + NEED TO SET ENV VARIABLES
*/
job "jitsi" { job "jitsi" {
datacenters = ["dc1"] datacenters = ["dc1"]
type = "service" type = "service"
@ -17,7 +11,7 @@ job "jitsi" {
task "xmpp" { task "xmpp" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_jitsi_xmpp:v1" image = "superboum/amd64_jitsi_xmpp:v2"
network_mode = "host" network_mode = "host"
port_map { port_map {
xmpp_port = 5222 xmpp_port = 5222
@ -93,7 +87,7 @@ job "jitsi" {
task "front" { task "front" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_jitsi_front:v5" image = "superboum/amd64_jitsi_meet:v1"
network_mode = "host" network_mode = "host"
port_map { port_map {
https_port = 443 https_port = 443
@ -157,7 +151,7 @@ job "jitsi" {
task "jicofo" { task "jicofo" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_jitsi_conference_focus:v2" image = "superboum/amd64_jitsi_conference_focus:v3"
network_mode = "host" network_mode = "host"
} }
@ -189,7 +183,7 @@ job "jitsi" {
task "videobridge" { task "videobridge" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_jitsi_videobridge:v9" image = "superboum/amd64_jitsi_videobridge:v10"
network_mode = "host" network_mode = "host"
port_map { port_map {
video1_port = 8080 video1_port = 8080

2
app/integration/jitsi/01_gen_certs.yml
View file

@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
jitsi-xmpp: jitsi-xmpp:
image: ./jitsi-xmpp image: ./jitsi-xmpp:v2
command: ["/usr/local/bin/xmpp_gen"] command: ["/usr/local/bin/xmpp_gen"]
volumes: [ './jitsi-certs/:/certs:rw' ] volumes: [ './jitsi-certs/:/certs:rw' ]
env_file: [ 'dev.env' ] env_file: [ 'dev.env' ]

2
app/integration/jitsi/02_run.yml
View file

@ -20,7 +20,7 @@ services:
env_file: [ 'dev.env' ] env_file: [ 'dev.env' ]
volumes: [ './jitsi-certs/:/certs:ro' ] volumes: [ './jitsi-certs/:/certs:ro' ]
jitsi-videobridge: jitsi-videobridge:
image: superboum/amd64_jitsi_videobridge:v10 image: superboum/amd64_jitsi_videobridge:v11
network_mode: host network_mode: host
ports: ports:
- "8080:8080/tcp" - "8080:8080/tcp"