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

pull/1176/head
Ben Banfield-Zanin 3 years ago committed by Saúl Ibarra Corretgé
parent d250ad7f57
commit a8a596bd6f
  1. 1
      docker-compose.yml
  2. 7
      jicofo/rootfs/defaults/jicofo.conf

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

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

Loading…
Cancel
Save