Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

jvb: use modern config for ice4j

Browse Source
This commit is contained in:
Saúl Ibarra Corretgé
2021-10-12 21:11:00 +02:00
parent 18ac85b69e
commit 76a16a8b78
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jvb/rootfs/defaults/jvb.conf
View File

@@ -68,10 +68,21 @@ ice4j {
harvest { harvest {
mapping { mapping {
stun { stun {
{{ if .Env.JVB_STUN_SERVERS }} {{ if .Env.JVB_STUN_SERVERS -}}
addresses = [ "{{ join "\",\"" (splitList "," .Env.JVB_STUN_SERVERS) }}" ] addresses = [ "{{ join "\",\"" (splitList "," .Env.JVB_STUN_SERVERS) }}" ]
{{ end }} {{ else -}}
} enabled = false
{{ end -}}
}
static-mappings = [
{{ if .Env.DOCKER_HOST_ADDRESS -}}
{
local-address = "{{ .Env.LOCAL_ADDRESS }}"
public-address = "{{ .Env.DOCKER_HOST_ADDRESS }}"
}
{{ end -}}
]
} }
} }
} }

5
jvb/rootfs/defaults/sip-communicator.properties
View File

@@ -1,5 +0,0 @@
{{ if .Env.DOCKER_HOST_ADDRESS }}
org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS={{ .Env.LOCAL_ADDRESS }}
org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS={{ .Env.DOCKER_HOST_ADDRESS }}
{{ end }}

3
jvb/rootfs/etc/cont-init.d/10-config
View File

@@ -14,9 +14,8 @@ if [[ "$JVB_AUTH_PASSWORD" == "$OLD_JVB_AUTH_PASSWORD" ]]; then
exit 1 exit 1
fi fi
tpl /defaults/sip-communicator.properties > /config/sip-communicator.properties
if [[ -f /config/custom-sip-communicator.properties ]]; then if [[ -f /config/custom-sip-communicator.properties ]]; then
cat /config/custom-sip-communicator.properties >> /config/sip-communicator.properties cat /config/custom-sip-communicator.properties > /config/sip-communicator.properties
fi fi
tpl /defaults/logging.properties > /config/logging.properties tpl /defaults/logging.properties > /config/logging.properties