diff options
| -rw-r--r-- | docker/jitsi/02_run.yml | 4 | ||||
| -rw-r--r-- | docker/jitsi/dev.env | 1 | ||||
| -rw-r--r-- | docker/jitsi/jitsi-front/Dockerfile | 8 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-videobridge/jvb_run | 13 | ||||
| -rw-r--r-- | nomad/jitsi.hcl | 6 |
5 files changed, 27 insertions, 5 deletions
diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml index 018fcb7..3d37f85 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:v1 + image: superboum/amd64_jitsi_front:v2 network_mode: host ports: - "443:443" @@ -26,7 +26,7 @@ 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" diff --git a/docker/jitsi/dev.env b/docker/jitsi/dev.env index 722ca1d..9a94a81 100644 --- a/docker/jitsi/dev.env +++ b/docker/jitsi/dev.env @@ -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 diff --git a/docker/jitsi/jitsi-front/Dockerfile b/docker/jitsi/jitsi-front/Dockerfile index 239372e..21e220c 100644 --- a/docker/jitsi/jitsi-front/Dockerfile +++ b/docker/jitsi/jitsi-front/Dockerfile @@ -5,7 +5,13 @@ RUN apt-get update && \ git clone --depth=1 https://github.com/jitsi/jitsi-meet.git && \ cd jitsi-meet && \ 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 diff --git a/docker/jitsi/jitsi-videobridge/jvb_run b/docker/jitsi/jitsi-videobridge/jvb_run index 1f55afd..64d36f2 100755 --- a/docker/jitsi/jitsi-videobridge/jvb_run +++ b/docker/jitsi/jitsi-videobridge/jvb_run @@ -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 \ diff --git a/nomad/jitsi.hcl b/nomad/jitsi.hcl index ff96792..d5d2f4b 100644 --- a/nomad/jitsi.hcl +++ b/nomad/jitsi.hcl @@ -189,7 +189,7 @@ job "jitsi" { task "videobridge" { driver = "docker" config { - image = "superboum/amd64_jitsi_videobridge:v4" + image = "superboum/amd64_jitsi_videobridge:v5" network_mode = "host" port_map { video1_port = 4443 @@ -201,6 +201,10 @@ job "jitsi" { } } + env { + JITSI_DEBUG = 1 + } + artifact { source = "http://127.0.0.1:8500/v1/kv/secrets/jitsi/global_env?raw" destination = "secrets/global_env.tpl" |