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

Merge branch 'feature/jitsi-upgrade'

This commit is contained in:
Quentin 2020-04-05 10:42:08 +02:00
parent 9ee8878233 510158e301
commit a4799a8e27
6 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/jitsi/02_run.yml
View File

@ -12,7 +12,7 @@ services:
volumes: [ './jitsi-certs/:/certs:ro' ]
jitsi-front:
build: ./jitsi-front
image: superboum/amd64_jitsi_front:v1
image: superboum/amd64_jitsi_front:v3
network_mode: host
ports:
- "443:443"
@ -26,10 +26,10 @@ services:
volumes: [ './jitsi-certs/:/certs:ro' ]
jitsi-videobridge:
build: ./jitsi-videobridge
image: superboum/amd64_jitsi_videobridge:v4
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' ]

1
docker/jitsi/dev.env
View File

@ -7,3 +7,4 @@ JITSI_PROSODY_HOST=127.0.0.1
JITSI_CERTS_FOLDER=/certs/
JITSI_NAT_PUBLIC_IP=77.204.7.239
JITSI_NAT_LOCAL_IP=192.168.0.18
JITSI_VIDEO_TCP=995

8
docker/jitsi/jitsi-front/Dockerfile
View File

@ -7,6 +7,14 @@ RUN apt-get update && \
npm install && \
make
RUN cd jitsi-meet && \
sed -i \
"s/OPTIMAL_BROWSERS: \[.*\],/ OPTIMAL_BROWSERS: [ 'chrome', 'chromium', 'nwjs', 'electron' ],/g" \
interface_config.js && \
sed -i \
"s/UNSUPPORTED_BROWSERS: \[.*\],/ UNSUPPORTED_BROWSERS: [ 'firefox' ],/g" \
interface_config.js
FROM debian:buster
COPY --from=builder /jitsi-meet /srv/jitsi-meet

6
docker/jitsi/jitsi-front/config.js
View File

@ -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: {

13
docker/jitsi/jitsi-videobridge/jvb_run
View File

@ -11,13 +11,24 @@ cat > /root/.sip-communicator/sip-communicator.properties <<EOF
org.jitsi.impl.neomedia.transform.srtp.SRTPCryptoContext.checkReplay=false
# The videobridge uses 443 by default with 4443 as a fallback, but since we're already
# running nginx on 443 in this example doc, we specify 4443 manually to avoid a race condition
org.jitsi.videobridge.TCP_HARVESTER_PORT=4443
org.jitsi.videobridge.TCP_HARVESTER_PORT=${JITSI_VIDEO_TCP}
org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP}
org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP}
org.jitsi.videobridge.NAT_HARVESTER_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP}
org.jitsi.videobridge.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP}
EOF
[ -v JITSI_DEBUG ] && cat >> /root/.sip-communicator/sip-communicator.properties <<EOF
net.java.sip.communicator.packetlogging.PACKET_LOGGING_ENABLED=true
net.java.sip.communicator.packetlogging.PACKET_LOGGING_ARBITRARY_ENABLED=true
net.java.sip.communicator.packetlogging.PACKET_LOGGING_SIP_ENABLED=true
net.java.sip.communicator.packetlogging.PACKET_LOGGING_JABBER_ENABLED=true
net.java.sip.communicator.packetlogging.PACKET_LOGGING_RTP_ENABLED=true
net.java.sip.communicator.packetlogging.PACKET_LOGGING_ICE4j_ENABLED=true
net.java.sip.communicator.packetlogging.PACKET_LOGGING_FILE_COUNT=1
net.java.sip.communicator.packetlogging.PACKET_LOGGING_FILE_SIZE=-1
EOF
/srv/jvb/jvb.sh \
--host=${JITSI_PROSODY_HOST} \
--domain=jitsi.deuxfleurs.fr \

13
nomad/jitsi.hcl
View File

@ -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:v4"
image = "superboum/amd64_jitsi_videobridge:v6"
network_mode = "host"
port_map {
video1_port = 4443
video1_port = 8080
video2_port = 10000
}
ulimit {
@ -201,6 +201,11 @@ job "jitsi" {
}
}
env {
#JITSI_DEBUG = 1
JITSI_VIDEO_TCP = 8080
}
artifact {
source = "http://127.0.0.1:8500/v1/kv/secrets/jitsi/global_env?raw"
destination = "secrets/global_env.tpl"
@ -217,7 +222,7 @@ job "jitsi" {
memory = 1500
network {
port "video1_port" {
static = "4443"
static = "8080"
}
port "video2_port" {
static = "10000"