fix(config) drop useStunTurn
Always attempt to discover the configured STUN/TURN servers.
This commit is contained in:
parent
478f1a731e
commit
1d9daa8da7
|
@ -323,10 +323,6 @@ var config = {
|
||||||
// is set in Jicofo and set to 2).
|
// is set in Jicofo and set to 2).
|
||||||
// minParticipants: 2,
|
// minParticipants: 2,
|
||||||
|
|
||||||
// Use the TURN servers discovered via XEP-0215 for the jitsi-videobridge
|
|
||||||
// connection
|
|
||||||
// useStunTurn: true,
|
|
||||||
|
|
||||||
// Use TURN/UDP servers for the jitsi-videobridge connection (by default
|
// Use TURN/UDP servers for the jitsi-videobridge connection (by default
|
||||||
// we filter out TURN/UDP because it is usually not needed since the
|
// we filter out TURN/UDP because it is usually not needed since the
|
||||||
// bridge itself is reachable via UDP)
|
// bridge itself is reachable via UDP)
|
||||||
|
@ -442,9 +438,6 @@ var config = {
|
||||||
// connection.
|
// connection.
|
||||||
enabled: true,
|
enabled: true,
|
||||||
|
|
||||||
// Use XEP-0215 to fetch STUN and TURN servers.
|
|
||||||
// useStunTurn: true,
|
|
||||||
|
|
||||||
// The STUN servers that will be used in the peer to peer connections
|
// The STUN servers that will be used in the peer to peer connections
|
||||||
stunServers: [
|
stunServers: [
|
||||||
|
|
||||||
|
|
|
@ -150,11 +150,6 @@ denied-peer-ip=240.0.0.0-255.255.255.255" >> $TURN_CONFIG
|
||||||
echo "------------------------------------------------"
|
echo "------------------------------------------------"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Enable turn server in config.js
|
|
||||||
if [ -f $JITSI_MEET_CONFIG ] ; then
|
|
||||||
sed -i "s/\/\/ useStunTurn: true/useStunTurn: true/g" $JITSI_MEET_CONFIG
|
|
||||||
fi
|
|
||||||
|
|
||||||
# and we're done with debconf
|
# and we're done with debconf
|
||||||
db_stop
|
db_stop
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -3,7 +3,7 @@ import extraConfigWhitelist from './extraConfigWhitelist';
|
||||||
/**
|
/**
|
||||||
* The config keys to whitelist, the keys that can be overridden.
|
* The config keys to whitelist, the keys that can be overridden.
|
||||||
* Currently we can only whitelist the first part of the properties, like
|
* Currently we can only whitelist the first part of the properties, like
|
||||||
* 'p2p.useStunTurn' and 'p2p.enabled' we whitelist all p2p options.
|
* 'p2p.enabled' we whitelist all p2p options.
|
||||||
* The whitelist is used only for config.js.
|
* The whitelist is used only for config.js.
|
||||||
*
|
*
|
||||||
* @type Array
|
* @type Array
|
||||||
|
@ -149,7 +149,6 @@ export default [
|
||||||
'stereo',
|
'stereo',
|
||||||
'subject',
|
'subject',
|
||||||
'testing',
|
'testing',
|
||||||
'useStunTurn',
|
|
||||||
'useTurnUdp',
|
'useTurnUdp',
|
||||||
'videoQuality.persist',
|
'videoQuality.persist',
|
||||||
'webrtcIceTcpDisable',
|
'webrtcIceTcpDisable',
|
||||||
|
|
Loading…
Reference in New Issue