Bläddra i källkod

jicofo: configure trusted-domains for Jibri if ENABLE_RECORDING is set

Ben Banfield-Zanin 3 år sedan
förälder
incheckning
a8a596b
2 ändrade filer med 6 tillägg och 2 borttagningar
  1. 1 0
      docker-compose.yml
  2. 5 2
      jicofo/rootfs/defaults/jicofo.conf

+ 1 - 0
docker-compose.yml

@@ -246,6 +246,7 @@ services:
             - XMPP_AUTH_DOMAIN
             - XMPP_INTERNAL_MUC_DOMAIN
             - XMPP_MUC_DOMAIN
+            - XMPP_RECORDER_DOMAIN
             - XMPP_SERVER
         depends_on:
             - prosody

+ 5 - 2
jicofo/rootfs/defaults/jicofo.conf

@@ -122,7 +122,7 @@ jicofo {
       // two MUST be in sync (otherwise bridges will crash because they won't know how to
       // deal with octo channels).
       enabled = {{ $ENABLE_OCTO }}
-      
+
       id = "{{ .Env.JICOFO_SHORT_ID | default "1" }}"
     }
 
@@ -136,11 +136,14 @@ jicofo {
         hostname = "{{ .Env.XMPP_SERVER }}"
         domain = "{{ .Env.XMPP_AUTH_DOMAIN }}"
         username = "{{ .Env.JICOFO_AUTH_USER }}"
-        password = "{{ .Env.JICOFO_AUTH_PASSWORD }}"  
+        password = "{{ .Env.JICOFO_AUTH_PASSWORD }}"
         conference-muc-jid = "{{ .Env.XMPP_MUC_DOMAIN }}"
         client-proxy = "focus.{{ .Env.XMPP_DOMAIN }}"
         disable-certificate-verification = true
       }
+      {{ if $ENABLE_RECORDING }}
+      trusted-domains = [ "{{ .Env.XMPP_RECORDER_DOMAIN }}" ]
+      {{ end }}
     }
 
     {{ if .Env.JICOFO_RESERVATION_ENABLED | default "false" | toBool }}