more updates march
This commit is contained in:
Nathan root
19
jitsi/jvb/rootfs/defaults/autoscaler-sidecar.config
Normal file
19
jitsi/jvb/rootfs/defaults/autoscaler-sidecar.config
Normal file
@@ -0,0 +1,19 @@
|
||||
{{ $JVB_COLIBRI_PORT := .Env.JVB_COLIBRI_PORT | default "8080" -}}
|
||||
{{ $SHUTDOWN_POLLING_INTERVAL := .Env.AUTOSCALER_SIDECAR_SHUTDOWN_POLLING_INTERVAL | default "60" -}}
|
||||
{{ $STATS_POLLING_INTERVAL := .Env.AUTOSCALER_SIDECAR_STATS_POLLING_INTERVAL | default "30" -}}
|
||||
export SHUTDOWN_POLLING_INTERVAL={{ $SHUTDOWN_POLLING_INTERVAL }}
|
||||
export STATS_POLLING_INTERVAL={{ $STATS_POLLING_INTERVAL }}
|
||||
export PORT={{ .Env.AUTOSCALER_SIDECAR_PORT }}
|
||||
export GRACEFUL_SHUTDOWN_SCRIPT="/usr/share/jitsi-videobridge/graceful_shutdown.sh"
|
||||
export TERMINATE_SCRIPT="/opt/jitsi/shutdown.sh"
|
||||
export ENABLE_REPORT_STATS=true
|
||||
export POLLING_URL="{{ .Env.AUTOSCALER_URL }}/sidecar/poll"
|
||||
export STATUS_URL="{{ .Env.AUTOSCALER_URL }}/sidecar/status"
|
||||
export SHUTDOWN_URL="{{ .Env.AUTOSCALER_URL }}/sidecar/shutdown"
|
||||
export STATS_RETRIEVE_URL="http://localhost:{{ $JVB_COLIBRI_PORT }}/colibri/stats"
|
||||
export STATS_REPORT_URL="{{ .Env.AUTOSCALER_URL }}/sidecar/stats"
|
||||
export ASAP_SIGNING_KEY_FILE="{{ .Env.AUTOSCALER_SIDECAR_KEY_FILE }}"
|
||||
export ASAP_JWT_KID="{{ .Env.AUTOSCALER_SIDECAR_KEY_ID }}"
|
||||
export INSTANCE_TYPE="JVB"
|
||||
export INSTANCE_ID="{{ .Env.AUTOSCALER_SIDECAR_INSTANCE_ID }}"
|
||||
export INSTANCE_METADATA='{"environment":"{{ .Env.XMPP_ENV_NAME }}","region":"{{ .Env.AUTOSCALER_SIDECAR_REGION }}","group":"{{ .Env.AUTOSCALER_SIDECAR_GROUP_NAME }}","name":"{{ .Env.JVB_INSTANCE_ID }}","version":"{{ .Env.JVB_VERSION }}","privateIp":"{{ .Env.LOCAL_ADDRESS }}","publicIp":"{{ .Env.JVB_ADVERTISE_IPS }}","hostId":"{{ .Env.AUTOSCALER_SIDECAR_HOST_ID }}"}'
|
||||
175
jitsi/jvb/rootfs/defaults/jvb.conf
Normal file
175
jitsi/jvb/rootfs/defaults/jvb.conf
Normal file
@@ -0,0 +1,175 @@
|
||||
{{ $COLIBRI_REST_ENABLED := .Env.COLIBRI_REST_ENABLED | default "false" | toBool -}}
|
||||
{{ $DISABLE_AWS_HARVESTER := .Env.DISABLE_AWS_HARVESTER | default "true" | toBool -}}
|
||||
{{ $DISABLE_XMPP := .Env.JVB_DISABLE_XMPP | default "0" | toBool -}}
|
||||
{{ $ENABLE_COLIBRI_WEBSOCKET := .Env.ENABLE_COLIBRI_WEBSOCKET | default "0" | toBool -}}
|
||||
{{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool -}}
|
||||
{{ $ENABLE_SCTP := .Env.ENABLE_SCTP | default "1" | toBool -}}
|
||||
{{ $ENABLE_JVB_XMPP_SERVER := .Env.ENABLE_JVB_XMPP_SERVER | default "0" | toBool }}
|
||||
{{ $JVB_DISABLE_STUN := .Env.JVB_DISABLE_STUN | default "0" | toBool -}}
|
||||
{{ $JVB_STUN_SERVERS := .Env.JVB_STUN_SERVERS | default "meet-jit-si-turnrelay.jitsi.net:443" -}}
|
||||
{{ $JVB_AUTH_USER := .Env.JVB_AUTH_USER | default "jvb" -}}
|
||||
{{ $JVB_BREWERY_MUC := .Env.JVB_BREWERY_MUC | default "jvbbrewery" -}}
|
||||
{{ $JVB_CC_TRUST_BWE := .Env.JVB_CC_TRUST_BWE | default "true" | toBool -}}
|
||||
{{ $JVB_MUC_NICKNAME := .Env.JVB_MUC_NICKNAME | default .Env.HOSTNAME -}}
|
||||
{{ $JVB_ADVERTISE_PRIVATE_CANDIDATES := .Env.JVB_ADVERTISE_PRIVATE_CANDIDATES | default "true" | toBool -}}
|
||||
{{ $JVB_ADVERTISE_IPS := .Env.JVB_ADVERTISE_IPS | default "" -}}
|
||||
{{ $JVB_IPS := splitList "," $JVB_ADVERTISE_IPS | compact -}}
|
||||
{{ $JVB_REQUIRE_VALID_ADDRESS := .Env.JVB_REQUIRE_VALID_ADDRESS | default "0" | toBool -}}
|
||||
{{ $JVB_XMPP_AUTH_DOMAIN := .Env.JVB_XMPP_AUTH_DOMAIN | default "auth.jvb.meet.jitsi" -}}
|
||||
{{ $JVB_XMPP_INTERNAL_MUC_DOMAIN := .Env.JVB_XMPP_INTERNAL_MUC_DOMAIN | default "muc.jvb.meet.jitsi" -}}
|
||||
{{ $JVB_XMPP_PORT := .Env.JVB_XMPP_PORT | default "6222" -}}
|
||||
{{ $JVB_XMPP_SERVER := .Env.JVB_XMPP_SERVER | default "xmpp.jvb.meet.jitsi" -}}
|
||||
{{ $JVB_XMPP_SERVERS := splitList "," $JVB_XMPP_SERVER | compact -}}
|
||||
{{ $PUBLIC_URL_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}}
|
||||
{{ $SHUTDOWN_REST_ENABLED := .Env.SHUTDOWN_REST_ENABLED | default "false" | toBool -}}
|
||||
{{ $USE_USRSCTP := .Env.JVB_USE_USRSCTP | default "false" | toBool -}}
|
||||
{{ $WS_DOMAIN := .Env.JVB_WS_DOMAIN | default $PUBLIC_URL_DOMAIN -}}
|
||||
{{ $WS_SERVER_ID := .Env.JVB_WS_SERVER_ID | default .Env.JVB_WS_SERVER_ID_FALLBACK | default "default" -}}
|
||||
{{ $WS_TLS := .Env.JVB_WS_TLS | default "1" | toBool -}}
|
||||
{{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}}
|
||||
{{ $XMPP_INTERNAL_MUC_DOMAIN := .Env.XMPP_INTERNAL_MUC_DOMAIN | default "internal-muc.meet.jitsi" -}}
|
||||
{{ $XMPP_PORT := .Env.XMPP_PORT | default "5222" -}}
|
||||
{{ $XMPP_SERVER := .Env.XMPP_SERVER | default "xmpp.meet.jitsi" -}}
|
||||
{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER | compact -}}
|
||||
{{/* assign env from context, preserve during range when . is re-assigned */}}
|
||||
{{ $ENV := .Env -}}
|
||||
|
||||
videobridge {
|
||||
cc {
|
||||
use-vla-target-bitrate = {{ .Env.ENABLE_VLA | default "0" | toBool }}
|
||||
trust-bwe = {{ $JVB_CC_TRUST_BWE }}
|
||||
}
|
||||
ice {
|
||||
udp {
|
||||
port = {{ .Env.JVB_PORT | default 10000 }}
|
||||
}
|
||||
advertise-private-candidates = {{ $JVB_ADVERTISE_PRIVATE_CANDIDATES }}
|
||||
}
|
||||
apis {
|
||||
{{ if not $DISABLE_XMPP -}}
|
||||
xmpp-client {
|
||||
configs {
|
||||
{{ if $ENABLE_JVB_XMPP_SERVER }}
|
||||
{{ range $index, $element := $JVB_XMPP_SERVERS -}}
|
||||
{{ $SERVER := splitn ":" 2 $element }}
|
||||
shard{{ $index }} {
|
||||
HOSTNAME = "{{ $SERVER._0 }}"
|
||||
PORT = "{{ $SERVER._1 | default $JVB_XMPP_PORT }}"
|
||||
DOMAIN = "{{ $JVB_XMPP_AUTH_DOMAIN }}"
|
||||
USERNAME = "{{ $JVB_AUTH_USER }}"
|
||||
PASSWORD = "{{ $ENV.JVB_AUTH_PASSWORD }}"
|
||||
MUC_JIDS = "{{ $JVB_BREWERY_MUC }}@{{ $JVB_XMPP_INTERNAL_MUC_DOMAIN }}"
|
||||
MUC_NICKNAME = "{{ $JVB_MUC_NICKNAME }}"
|
||||
DISABLE_CERTIFICATE_VERIFICATION = true
|
||||
}
|
||||
{{ end -}}
|
||||
{{ else }}
|
||||
{{ range $index, $element := $XMPP_SERVERS -}}
|
||||
{{ $SERVER := splitn ":" 2 $element }}
|
||||
shard{{ $index }} {
|
||||
HOSTNAME = "{{ $SERVER._0 }}"
|
||||
PORT = "{{ $SERVER._1 | default $XMPP_PORT }}"
|
||||
DOMAIN = "{{ $XMPP_AUTH_DOMAIN }}"
|
||||
USERNAME = "{{ $JVB_AUTH_USER }}"
|
||||
PASSWORD = "{{ $ENV.JVB_AUTH_PASSWORD }}"
|
||||
MUC_JIDS = "{{ $JVB_BREWERY_MUC }}@{{ $XMPP_INTERNAL_MUC_DOMAIN }}"
|
||||
MUC_NICKNAME = "{{ $JVB_MUC_NICKNAME }}"
|
||||
DISABLE_CERTIFICATE_VERIFICATION = true
|
||||
}
|
||||
{{ end -}}
|
||||
{{ end -}}
|
||||
}
|
||||
}
|
||||
{{ end -}}
|
||||
rest {
|
||||
enabled = {{ $COLIBRI_REST_ENABLED }}
|
||||
}
|
||||
}
|
||||
rest {
|
||||
shutdown {
|
||||
enabled = {{ $SHUTDOWN_REST_ENABLED }}
|
||||
}
|
||||
}
|
||||
sctp {
|
||||
enabled = {{ $ENABLE_SCTP }}
|
||||
use-usrsctp = {{ $USE_USRSCTP }}
|
||||
}
|
||||
stats {
|
||||
enabled = true
|
||||
}
|
||||
websockets {
|
||||
enabled = {{ $ENABLE_COLIBRI_WEBSOCKET }}
|
||||
domain = "{{ $WS_DOMAIN }}"
|
||||
tls = {{ $WS_TLS }}
|
||||
server-id = "{{ $WS_SERVER_ID }}"
|
||||
}
|
||||
http-servers {
|
||||
private {
|
||||
host = 0.0.0.0
|
||||
send-server-version = false
|
||||
}
|
||||
public {
|
||||
host = 0.0.0.0
|
||||
port = 9090
|
||||
send-server-version = false
|
||||
}
|
||||
}
|
||||
health {
|
||||
require-valid-address = {{ $JVB_REQUIRE_VALID_ADDRESS }}
|
||||
}
|
||||
|
||||
{{ if $ENABLE_OCTO -}}
|
||||
relay {
|
||||
enabled = true
|
||||
region = "{{ .Env.JVB_OCTO_REGION | default "europe" }}"
|
||||
relay-id = "{{ .Env.JVB_OCTO_RELAY_ID | default .Env.JVB_OCTO_BIND_ADDRESS }}"
|
||||
}
|
||||
{{ end -}}
|
||||
}
|
||||
|
||||
jmt {
|
||||
bwe {
|
||||
estimator {
|
||||
engine = "{{ .Env.BWE_ESTIMATOR_ENGINE | default "GoogleCc2" }}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ice4j {
|
||||
harvest {
|
||||
mapping {
|
||||
aws {
|
||||
enabled = {{ not $DISABLE_AWS_HARVESTER }}
|
||||
}
|
||||
stun {
|
||||
{{ if not $JVB_DISABLE_STUN -}}
|
||||
addresses = [ "{{ join "\",\"" (splitList "," $JVB_STUN_SERVERS) }}" ]
|
||||
{{ else -}}
|
||||
enabled = false
|
||||
{{ end -}}
|
||||
}
|
||||
static-mappings = [
|
||||
{{ range $index, $element := $JVB_IPS -}}
|
||||
{{ if contains "#" $element -}}
|
||||
{{ $element_ip_port := splitn "#" 2 $element -}}
|
||||
{
|
||||
local-address = "{{ $ENV.LOCAL_ADDRESS }}"
|
||||
public-address = "{{ $element_ip_port._0 }}"
|
||||
local-port = {{ $ENV.JVB_PORT | default 10000 }}
|
||||
public-port = {{ $element_ip_port._1 }}
|
||||
name = "ip-{{ $index }}"
|
||||
},
|
||||
{{ else -}}
|
||||
{
|
||||
local-address = "{{ $ENV.LOCAL_ADDRESS }}"
|
||||
public-address = "{{ $element }}"
|
||||
name = "ip-{{ $index }}"
|
||||
},
|
||||
{{ end -}}
|
||||
{{ end -}}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
include "custom-jvb.conf"
|
||||
12
jitsi/jvb/rootfs/defaults/logging.properties
Normal file
12
jitsi/jvb/rootfs/defaults/logging.properties
Normal file
@@ -0,0 +1,12 @@
|
||||
{{ if .Env.SENTRY_DSN | toBool }}
|
||||
handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
|
||||
{{ else }}
|
||||
handlers= java.util.logging.ConsoleHandler
|
||||
{{ end }}
|
||||
|
||||
java.util.logging.ConsoleHandler.level = ALL
|
||||
java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
|
||||
org.jitsi.utils.logging2.JitsiLogFormatter.programname=JVB
|
||||
|
||||
.level=INFO
|
||||
io.sentry.jul.SentryHandler.level=WARNING
|
||||
Reference in New Issue
Block a user