From 7c0c795fa7d29d04248ec6201ef7b879f4dc537f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Mon, 30 Mar 2020 14:05:15 +0200
Subject: [PATCH] jicofo: only configure Jigasi brewery if Jigasi is configured

Otherwise conferene.isSIPCallingSupported() will return true.
---
 docker-compose.yml                                 | 1 +
 jicofo/rootfs/defaults/sip-communicator.properties | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bdf39b6..9776fe5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -122,6 +122,7 @@ services:
             - JICOFO_RESERVATION_REST_BASE_URL
             - JVB_BREWERY_MUC
             - JIGASI_BREWERY_MUC
+            - JIGASI_SIP_URI
             - JIBRI_BREWERY_MUC
             - JIBRI_PENDING_TIMEOUT
             - TZ
diff --git a/jicofo/rootfs/defaults/sip-communicator.properties b/jicofo/rootfs/defaults/sip-communicator.properties
index c28b7b2..6ac697a 100644
--- a/jicofo/rootfs/defaults/sip-communicator.properties
+++ b/jicofo/rootfs/defaults/sip-communicator.properties
@@ -6,7 +6,7 @@ org.jitsi.jicofo.jibri.BREWERY={{ .Env.JIBRI_BREWERY_MUC}}@{{ .Env.XMPP_INTERNAL
 org.jitsi.jicofo.jibri.PENDING_TIMEOUT={{ .Env.JIBRI_PENDING_TIMEOUT }}
 {{ end }}
 
-{{ if .Env.JIGASI_BREWERY_MUC }}
+{{ if and .Env.JIGASI_SIP_URI .Env.JIGASI_BREWERY_MUC }}
 org.jitsi.jicofo.jigasi.BREWERY={{ .Env.JIGASI_BREWERY_MUC}}@{{ .Env.XMPP_INTERNAL_MUC_DOMAIN }}
 {{ end }}