Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds turn config. #1063

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,12 @@ services:
- LOG_LEVEL
- PUBLIC_URL
- TZ
- ENABLE_TURN
- TURN_SECRET
- TURN_HOST
- TURN_PORT
- TURN_TRANSPORT
- TURN_TYPE
networks:
meet.jitsi:
aliases:
Expand Down
18 changes: 18 additions & 0 deletions env.example
Original file line number Diff line number Diff line change
Expand Up @@ -380,3 +380,21 @@ RESTART_POLICY=unless-stopped

# Authenticate using external service or just focus external auth window if there is one already.
# TOKEN_AUTH_URL=https://auth.meet.example.com/{room}

# Use TURN for JVB (bridge mode) connections
#ENABLE_TURN=0

# Secret for connect to TURN server (required if ENABLE_TURN=1)
#TURN_SECRET=

# Annonce FQDN or IP address of turn server (required if ENABLE_TURN=1)
#TURN_HOST=

# TLS/TCP/UDP turn port for connection
#TURN_PORT=3478

# Type of TURN(s)/STUN. Can be turn or turns.
#TURN_TYPE=turns

# Transport for stun/turn connection. Can be tcp or udp.
#TURN_TRANSPORT=tcp
3 changes: 3 additions & 0 deletions prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
{{ if and $ENABLE_AUTH (eq $AUTH_TYPE "ldap") }}
"auth_cyrus";
{{end}}
{{ if .Env.ENABLE_TURN | default "0" | toBool }}
"turncredentials";
{{end}}
}

{{ if $ENABLE_LOBBY }}
Expand Down
13 changes: 13 additions & 0 deletions prosody/rootfs/defaults/prosody.cfg.lua
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,17 @@ smacks_hibernation_time = 60;
smacks_max_hibernated_sessions = 1;
smacks_max_old_sessions = 1;

{{ if .Env.ENABLE_TURN | default "0" | toBool }}
turncredentials_secret = "{{ .Env.TURN_SECRET }}";
turncredentials_ttl = "{{ .Env.TURN_TTL | default "86400" }}";
turncredentials = {
{
type = "{{ .Env.TURN_PROTO | default "turns" }}",
host = "{{ .Env.TURN_HOST }}",
port = "{{ .Env.TURN_PORT | default "3478" }}",
transport = "{{ .Env.TURN_TRANSPORT | default "tcp" }}"
}
}
{{ end }}

Include "conf.d/*.cfg.lua"
11 changes: 11 additions & 0 deletions prosody/rootfs/etc/cont-init.d/10-config
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,17 @@ if [[ "$(stat -c %U /prosody-plugins-custom)" != "prosody" ]]; then
chown -R prosody /prosody-plugins-custom
fi

if [[ "${ENABLE_TURN}" == "1" || "${ENABLE_TURN}" == "true" ]]; then
if [[ -z $TURN_HOST ]]; then
echo 'FATAL ERROR: TURN_HOST must be set when ENABLE_TURN is true.'
exit 1
fi
if [[ -z $TURN_SECRET ]]; then
echo 'FATAL ERROR: TURN_SECRET must be set when ENABLE_TURN is true.'
exit 1
fi
fi

cp -r /defaults/* /config
tpl /defaults/prosody.cfg.lua > $PROSODY_CFG
tpl /defaults/conf.d/jitsi-meet.cfg.lua > /config/conf.d/jitsi-meet.cfg.lua
Expand Down