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

Try to improve Jitsi

Browse source
This commit is contained in:
Quentin 2020-04-02 20:24:50 +02:00
parent 9ee8878233
commit 7c4cef0f9c
5 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/jitsi/02_run.yml
View file

@ -12,7 +12,7 @@ services:
volumes: [ './jitsi-certs/:/certs:ro' ] volumes: [ './jitsi-certs/:/certs:ro' ]
jitsi-front: jitsi-front:
build: ./jitsi-front build: ./jitsi-front
image: superboum/amd64_jitsi_front:v1 image: superboum/amd64_jitsi_front:v2
network_mode: host network_mode: host
ports: ports:
- "443:443" - "443:443"
@ -26,7 +26,7 @@ services:
volumes: [ './jitsi-certs/:/certs:ro' ] volumes: [ './jitsi-certs/:/certs:ro' ]
jitsi-videobridge: jitsi-videobridge:
build: ./jitsi-videobridge build: ./jitsi-videobridge
image: superboum/amd64_jitsi_videobridge:v4 image: superboum/amd64_jitsi_videobridge:v6
network_mode: host network_mode: host
ports: ports:
- "4443:4443" - "4443:4443"

1
docker/jitsi/dev.env
View file

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

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

@ -5,7 +5,13 @@ RUN apt-get update && \
git clone --depth=1 https://github.com/jitsi/jitsi-meet.git && \ git clone --depth=1 https://github.com/jitsi/jitsi-meet.git && \
cd jitsi-meet && \ cd jitsi-meet && \
npm install && \ npm install && \
make make && \
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 FROM debian:buster

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 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 # 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 # 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_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP}
org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_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_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP}
org.jitsi.videobridge.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP} org.jitsi.videobridge.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP}
EOF 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 \ /srv/jvb/jvb.sh \
--host=${JITSI_PROSODY_HOST} \ --host=${JITSI_PROSODY_HOST} \
--domain=jitsi.deuxfleurs.fr \ --domain=jitsi.deuxfleurs.fr \

6
nomad/jitsi.hcl
View file

@ -189,7 +189,7 @@ job "jitsi" {
task "videobridge" { task "videobridge" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_jitsi_videobridge:v4" image = "superboum/amd64_jitsi_videobridge:v5"
network_mode = "host" network_mode = "host"
port_map { port_map {
video1_port = 4443 video1_port = 4443
@ -201,6 +201,10 @@ job "jitsi" {
} }
} }
env {
JITSI_DEBUG = 1
}
artifact { artifact {
source = "http://127.0.0.1:8500/v1/kv/secrets/jitsi/global_env?raw" source = "http://127.0.0.1:8500/v1/kv/secrets/jitsi/global_env?raw"
destination = "secrets/global_env.tpl" destination = "secrets/global_env.tpl"