jicofo: disable octo by default

pull/1014/head
Prayag Singh 4 years ago committed by GitHub
parent 1fa5048510
commit d6fac8e0c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      docker-compose.yml
  2. 7
      jicofo/rootfs/defaults/jicofo.conf

@ -187,6 +187,7 @@ services:
- ENABLE_CODEC_VP8 - ENABLE_CODEC_VP8
- ENABLE_CODEC_VP9 - ENABLE_CODEC_VP9
- ENABLE_CODEC_H264 - ENABLE_CODEC_H264
- ENABLE_OCTO
- ENABLE_RECORDING - ENABLE_RECORDING
- ENABLE_SCTP - ENABLE_SCTP
- JICOFO_AUTH_USER - JICOFO_AUTH_USER

@ -2,6 +2,7 @@
{{ $ENABLE_SCTP := .Env.ENABLE_SCTP | default "0" | toBool }} {{ $ENABLE_SCTP := .Env.ENABLE_SCTP | default "0" | toBool }}
{{ $AUTH_TYPE := .Env.AUTH_TYPE | default "internal" }} {{ $AUTH_TYPE := .Env.AUTH_TYPE | default "internal" }}
{{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | default "0" | toBool }} {{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | default "0" | toBool }}
{{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool }}
jicofo { jicofo {
{{ if $ENABLE_AUTH }} {{ if $ENABLE_AUTH }}
@ -114,6 +115,12 @@ jicofo {
{{ end }} {{ end }}
octo { octo {
// Whether or not to use Octo. Note that when enabled, its use will be determined by
// $jicofo.bridge.selection-strategy. There's a corresponding flag in the JVB and these
// 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" }}" id = "{{ .Env.JICOFO_SHORT_ID | default "1" }}"
} }

Loading…
Cancel
Save