Browse Source

fix(config) drop useStunTurn

Always attempt to discover the configured STUN/TURN servers.
j8
Saúl Ibarra Corretgé 4 years ago
parent
commit
1d9daa8da7

+ 0
- 7
config.js View File

323
     // is set in Jicofo and set to 2).
323
     // is set in Jicofo and set to 2).
324
     // minParticipants: 2,
324
     // minParticipants: 2,
325
 
325
 
326
-    // Use the TURN servers discovered via XEP-0215 for the jitsi-videobridge
327
-    // connection
328
-    // useStunTurn: true,
329
-
330
     // Use TURN/UDP servers for the jitsi-videobridge connection (by default
326
     // Use TURN/UDP servers for the jitsi-videobridge connection (by default
331
     // we filter out TURN/UDP because it is usually not needed since the
327
     // we filter out TURN/UDP because it is usually not needed since the
332
     // bridge itself is reachable via UDP)
328
     // bridge itself is reachable via UDP)
442
         // connection.
438
         // connection.
443
         enabled: true,
439
         enabled: true,
444
 
440
 
445
-        // Use XEP-0215 to fetch STUN and TURN servers.
446
-        // useStunTurn: true,
447
-
448
         // The STUN servers that will be used in the peer to peer connections
441
         // The STUN servers that will be used in the peer to peer connections
449
         stunServers: [
442
         stunServers: [
450
 
443
 

+ 0
- 5
debian/jitsi-meet-turnserver.postinst View File

150
             echo "------------------------------------------------"
150
             echo "------------------------------------------------"
151
         fi
151
         fi
152
 
152
 
153
-        # Enable turn server in config.js
154
-        if [ -f $JITSI_MEET_CONFIG ] ; then
155
-            sed -i "s/\/\/ useStunTurn: true/useStunTurn: true/g" $JITSI_MEET_CONFIG
156
-        fi
157
-
158
         # and we're done with debconf
153
         # and we're done with debconf
159
         db_stop
154
         db_stop
160
     ;;
155
     ;;

+ 1
- 2
react/features/base/config/configWhitelist.js View File

3
 /**
3
 /**
4
  * The config keys to whitelist, the keys that can be overridden.
4
  * The config keys to whitelist, the keys that can be overridden.
5
  * Currently we can only whitelist the first part of the properties, like
5
  * Currently we can only whitelist the first part of the properties, like
6
- * 'p2p.useStunTurn' and 'p2p.enabled' we whitelist all p2p options.
6
+ * 'p2p.enabled' we whitelist all p2p options.
7
  * The whitelist is used only for config.js.
7
  * The whitelist is used only for config.js.
8
  *
8
  *
9
  * @type Array
9
  * @type Array
149
     'stereo',
149
     'stereo',
150
     'subject',
150
     'subject',
151
     'testing',
151
     'testing',
152
-    'useStunTurn',
153
     'useTurnUdp',
152
     'useTurnUdp',
154
     'videoQuality.persist',
153
     'videoQuality.persist',
155
     'webrtcIceTcpDisable',
154
     'webrtcIceTcpDisable',

Loading…
Cancel
Save