ソースを参照

jicofo: disable octo by default

Prayag Singh 4 年 前
コミット
d6fac8e0c3
2 ファイル変更8 行追加0 行削除
  1. 1 0
      docker-compose.yml
  2. 7 0
      jicofo/rootfs/defaults/jicofo.conf

+ 1 - 0
docker-compose.yml

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

+ 7 - 0
jicofo/rootfs/defaults/jicofo.conf

@@ -2,6 +2,7 @@
 {{ $ENABLE_SCTP := .Env.ENABLE_SCTP | default "0" | toBool }}
 {{ $AUTH_TYPE := .Env.AUTH_TYPE | default "internal" }}
 {{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | default "0" | toBool }}
+{{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool }}
 
 jicofo {
     {{ if $ENABLE_AUTH }}
@@ -114,6 +115,12 @@ jicofo {
     {{ end }}
 
     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" }}"
     }