From 395437ebb91aad86bd7a92514146e7661568e8d8 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Fri, 27 Mar 2020 22:48:12 +0100 Subject: Still fixing jitsi nomad service --- consul/secrets/jitsi/global_env.sample | 2 +- docker/jitsi/02_run.yml | 2 +- docker/jitsi/jitsi-videobridge/jvb_run | 5 ++++- nomad/jitsi.hcl | 30 +++++++++++++++++++++++++----- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/consul/secrets/jitsi/global_env.sample b/consul/secrets/jitsi/global_env.sample index 3c0f84a..658c9c9 100644 --- a/consul/secrets/jitsi/global_env.sample +++ b/consul/secrets/jitsi/global_env.sample @@ -6,4 +6,4 @@ JITSI_PROSODY_BOSH_HOST=127.0.0.1 JITSI_PROSODY_HOST=127.0.0.1 JITSI_CERTS_FOLDER=/secrets/certs/ JITSI_NAT_PUBLIC_IP=redacted -JITSI_NAT_LOCAL_IP={{ env "NOMAD_IP_videobridge_video1_port" }} +JITSI_NAT_LOCAL_IP={{ env "NOMAD_IP_video1_port" }} diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml index af615a9..a3dcda6 100644 --- a/docker/jitsi/02_run.yml +++ b/docker/jitsi/02_run.yml @@ -26,7 +26,7 @@ services: volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: build: ./jitsi-videobridge - image: superboum/amd64_jitsi_videobridge:v1 + image: superboum/amd64_jitsi_videobridge:v3 network_mode: host ports: - "4443:4443" diff --git a/docker/jitsi/jitsi-videobridge/jvb_run b/docker/jitsi/jitsi-videobridge/jvb_run index 2431081..7078239 100755 --- a/docker/jitsi/jitsi-videobridge/jvb_run +++ b/docker/jitsi/jitsi-videobridge/jvb_run @@ -6,14 +6,17 @@ ${JITSI_PROSODY_HOST} jitsi.deuxfleurs.fr conference.jitsi.deuxfleurs.fr jitsi-v EOF cd /srv/jvb +mkdir -p /srv/jvb/.sip-communicator -cat > ~/.sip-communicator/sip-communicator.properties < /srv/jvb/.sip-communicator/sip-communicator.properties <