jvb: migrate config to secure octo
* Migrating configuration to use secure octo configuration by default Adding a new JVB_OCTO_RELAY_ID to configure videobridge.relay.relay-id (with a fallback to the old JVB_OCTO_BIND_ADDRESS to be used as relay-id) * Adding a configuration check to verify that Octo cannot be enabled without the ENABLE_COLIBRI_WEBSOCKET environment variable set to "1"
This commit is contained in:
@@ -77,12 +77,10 @@ videobridge {
|
||||
}
|
||||
|
||||
{{ if $ENABLE_OCTO -}}
|
||||
octo {
|
||||
relay {
|
||||
enabled = true
|
||||
bind-address = "{{ .Env.JVB_OCTO_BIND_ADDRESS | default "0.0.0.0" }}"
|
||||
public-address = "{{ .Env.JVB_OCTO_PUBLIC_ADDRESS }}"
|
||||
bind-port = "{{ .Env.JVB_OCTO_BIND_PORT | default "4096" }}"
|
||||
region = "{{ .Env.JVB_OCTO_REGION | default "europe" }}"
|
||||
relay-id = "{{ .Env.JVB_OCTO_RELAY_ID | default .Env.JVB_OCTO_BIND_ADDRESS }}"
|
||||
}
|
||||
{{ end -}}
|
||||
}
|
||||
|
||||
@@ -31,3 +31,9 @@ tpl /defaults/logging.properties > /config/logging.properties
|
||||
tpl /defaults/jvb.conf > /config/jvb.conf
|
||||
|
||||
chown -R jvb:jitsi /config
|
||||
|
||||
# Configuration checks
|
||||
if [[ (-z $ENABLE_COLIBRI_WEBSOCKET || $ENABLE_COLIBRI_WEBSOCKET == "0") && $ENABLE_OCTO == "1" ]]; then
|
||||
echo "ERROR: In order to enable Octo relays (with ENABLE_OCTO=1), you MUST enable Colibri websockets (with ENABLE_COLIBRI_WEBSOCKET=1)";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user