aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-04-05 10:41:24 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-04-05 10:41:24 +0200
commit510158e301d3a5da6c1d84a65dbc04b03a4d56eb (patch)
treeb51eed6f2001406a7a25bbe56e2ebe79c4c08601
parent7c4cef0f9c684a8d29cceb5991d9aab3f6702d84 (diff)
downloadinfrastructure-feature/jitsi-upgrade.tar.gz
infrastructure-feature/jitsi-upgrade.zip
Last jitsi configfeature/jitsi-upgrade
-rw-r--r--docker/jitsi/02_run.yml4
-rw-r--r--docker/jitsi/jitsi-front/Dockerfile4
-rw-r--r--docker/jitsi/jitsi-front/config.js6
-rw-r--r--nomad/jitsi.hcl11
4 files changed, 14 insertions, 11 deletions
diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml
index 3d37f85..e1db056 100644
--- a/docker/jitsi/02_run.yml
+++ b/docker/jitsi/02_run.yml
@@ -12,7 +12,7 @@ services:
volumes: [ './jitsi-certs/:/certs:ro' ]
jitsi-front:
build: ./jitsi-front
- image: superboum/amd64_jitsi_front:v2
+ image: superboum/amd64_jitsi_front:v3
network_mode: host
ports:
- "443:443"
@@ -29,7 +29,7 @@ services:
image: superboum/amd64_jitsi_videobridge:v6
network_mode: host
ports:
- - "4443:4443"
+ - "995:995"
- "10000:10000/udp"
env_file: [ 'dev.env' ]
volumes: [ './jitsi-certs/:/certs:ro' ]
diff --git a/docker/jitsi/jitsi-front/Dockerfile b/docker/jitsi/jitsi-front/Dockerfile
index 21e220c..62fa166 100644
--- a/docker/jitsi/jitsi-front/Dockerfile
+++ b/docker/jitsi/jitsi-front/Dockerfile
@@ -5,7 +5,9 @@ RUN apt-get update && \
git clone --depth=1 https://github.com/jitsi/jitsi-meet.git && \
cd jitsi-meet && \
npm install && \
- make && \
+ make
+
+RUN cd jitsi-meet && \
sed -i \
"s/OPTIMAL_BROWSERS: \[.*\],/ OPTIMAL_BROWSERS: [ 'chrome', 'chromium', 'nwjs', 'electron' ],/g" \
interface_config.js && \
diff --git a/docker/jitsi/jitsi-front/config.js b/docker/jitsi/jitsi-front/config.js
index 34f0662..b172303 100644
--- a/docker/jitsi/jitsi-front/config.js
+++ b/docker/jitsi/jitsi-front/config.js
@@ -268,7 +268,7 @@ var config = {
// disable1On1Mode: false,
// Default language for the user interface.
- // defaultLanguage: 'en',
+ defaultLanguage: 'fr',
// If true all users without a token will be considered guests and all users
// with token will be considered non-guests. Only guests will be allowed to
@@ -359,7 +359,7 @@ var config = {
// If set to true, it will prefer to use H.264 for P2P calls (if H.264
// is supported).
- preferH264: true
+ preferH264: true,
// If set to true, disable H.264 video codec by stripping it out of the
// SDP.
@@ -367,7 +367,7 @@ var config = {
// How long we're going to wait, before going back to P2P after the 3rd
// participant has left the conference (to filter out page reload).
- // backToP2PDelay: 5
+ backToP2PDelay: 60
},
analytics: {
diff --git a/nomad/jitsi.hcl b/nomad/jitsi.hcl
index d5d2f4b..3cf3c7e 100644
--- a/nomad/jitsi.hcl
+++ b/nomad/jitsi.hcl
@@ -93,7 +93,7 @@ job "jitsi" {
task "front" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_front:v1"
+ image = "superboum/amd64_jitsi_front:v3"
network_mode = "host"
port_map {
https_port = 443
@@ -189,10 +189,10 @@ job "jitsi" {
task "videobridge" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_videobridge:v5"
+ image = "superboum/amd64_jitsi_videobridge:v6"
network_mode = "host"
port_map {
- video1_port = 4443
+ video1_port = 8080
video2_port = 10000
}
ulimit {
@@ -202,7 +202,8 @@ job "jitsi" {
}
env {
- JITSI_DEBUG = 1
+ #JITSI_DEBUG = 1
+ JITSI_VIDEO_TCP = 8080
}
artifact {
@@ -221,7 +222,7 @@ job "jitsi" {
memory = 1500
network {
port "video1_port" {
- static = "4443"
+ static = "8080"
}
port "video2_port" {
static = "10000"