🎨 always place trusted domain configuration

it does not hurt to have them, so the conditions simply increase config complexity
jitsi · Sep 20, 2024 · 48e66eb · 48e66eb
1 parent 2dd66de
commit 48e66eb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf
@@ -38,7 +38,7 @@
 {{ $XMPP_SERVER := .Env.XMPP_SERVER | default "xmpp.meet.jitsi" -}}
 {{ $MAX_SSRCS_PER_USER := .Env.MAX_SSRCS_PER_USER | default "20" -}}
 {{ $MAX_SSRC_GROUPS_PER_USER := .Env.MAX_SSRC_GROUPS_PER_USER | default $MAX_SSRCS_PER_USER -}}
-{{ $TRUSTED_DOMAIN_LIST := .Env.JICOFO_TRUSTED_DOMAINS | default (or $ENABLE_RECORDING $ENABLE_TRANSCRIPTIONS | ternary $XMPP_HIDDEN_DOMAIN "") -}}
+{{ $TRUSTED_DOMAIN_LIST := .Env.JIGASI_TRUSTED_DOMAINS | default "" -}}
 {{ $TRUSTED_DOMAINS := splitList "," $TRUSTED_DOMAIN_LIST -}}
 {{ $ENV := .Env }}
 

diff --git a/jigasi/rootfs/defaults/sip-communicator.properties b/jigasi/rootfs/defaults/sip-communicator.properties
@@ -189,7 +189,5 @@ org.jitsi.jigasi.DEFAULT_JVB_ROOM_NAME={{ .Env.JIGASI_SIP_DEFAULT_ROOM }}
 
 org.jitsi.jigasi.MUC_SERVICE_ADDRESS={{ $XMPP_MUC_DOMAIN }}
 
-# when checking other participants whether they are jibri/jigasi we can also check the the domain they use for connecting
-{{ if $TRUSTED_DOMAIN_LIST }}
+# when checking other participants whether they are jibri/jigasi we can also check the domain they use for connecting
 org.jitsi.jigasi.TRUSTED_DOMAINS=[ {{ range $index, $element := $TRUSTED_DOMAINS }}{{ if gt $index 0 }},{{ end }}"{{ $element }}"{{ end}} ]
-{{ end }}
diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -234,10 +234,8 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
     room_metadata_component = "metadata.{{ $XMPP_DOMAIN }}"
     {{ if $ENABLE_LOBBY }}
     lobby_muc = "lobby.{{ $XMPP_DOMAIN }}"
-    {{ if or $ENABLE_RECORDING $ENABLE_TRANSCRIPTIONS }}
     muc_lobby_whitelist = { "{{ $XMPP_HIDDEN_DOMAIN }}" }
     {{ end }}
-    {{ end }}
 
     {{ if $PROSODY_RESERVATION_ENABLED }}
     reservations_api_prefix = "{{ $PROSODY_RESERVATION_REST_BASE_URL }}"