Browse Source

jicofo: only configure Jigasi brewery if Jigasi is configured

Otherwise conferene.isSIPCallingSupported() will return true.
Saúl Ibarra Corretgé 5 years ago
parent
commit
7c0c795fa7
2 changed files with 2 additions and 1 deletions
  1. 1 0
      docker-compose.yml
  2. 1 1
      jicofo/rootfs/defaults/sip-communicator.properties

+ 1 - 0
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

+ 1 - 1
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 }}