From a8a596bd6f02b185c1fc722a8afcd7442970797f Mon Sep 17 00:00:00 2001
From: Ben Banfield-Zanin <benbz@matrix.org>
Date: Tue, 14 Dec 2021 09:41:30 +0000
Subject: [PATCH] jicofo: configure trusted-domains for Jibri if
 ENABLE_RECORDING is set

---
 docker-compose.yml                 | 1 +
 jicofo/rootfs/defaults/jicofo.conf | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8ed63a2..45c9db8 100644
--- a/docker-compose.yml
+++ b/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
diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf
index 10c3e7f..52493e5 100644
--- a/jicofo/rootfs/defaults/jicofo.conf
+++ b/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 }}