Browse Source

web: remove no longer needed settings

They default to true now and they have been removed.
Saúl Ibarra Corretgé 4 years ago
parent
commit
991f695
2 changed files with 0 additions and 8 deletions
  1. 0 2
      docker-compose.yml
  2. 0 6
      web/rootfs/defaults/settings-config.js

+ 0 - 2
docker-compose.yml

@@ -71,7 +71,6 @@ services:
             - MATOMO_SITE_ID
             - MATOMO_SITE_ID
             - MICROSOFT_API_APP_CLIENT_ID
             - MICROSOFT_API_APP_CLIENT_ID
             - NGINX_RESOLVER
             - NGINX_RESOLVER
-            - P2P_USE_STUN_TURN
             - PEOPLE_SEARCH_URL
             - PEOPLE_SEARCH_URL
             - RESOLUTION
             - RESOLUTION
             - RESOLUTION_MIN
             - RESOLUTION_MIN
@@ -83,7 +82,6 @@ services:
             - START_VIDEO_MUTED
             - START_VIDEO_MUTED
             - TESTING_CAP_SCREENSHARE_BITRATE
             - TESTING_CAP_SCREENSHARE_BITRATE
             - TESTING_OCTO_PROBABILITY
             - TESTING_OCTO_PROBABILITY
-            - USE_STUN_TURN
             - XMPP_AUTH_DOMAIN
             - XMPP_AUTH_DOMAIN
             - XMPP_BOSH_URL_BASE
             - XMPP_BOSH_URL_BASE
             - XMPP_DOMAIN
             - XMPP_DOMAIN

+ 0 - 6
web/rootfs/defaults/settings-config.js

@@ -17,7 +17,6 @@
 {{ $ENABLE_TALK_WHILE_MUTED := .Env.ENABLE_TALK_WHILE_MUTED | default "false" | toBool -}}
 {{ $ENABLE_TALK_WHILE_MUTED := .Env.ENABLE_TALK_WHILE_MUTED | default "false" | toBool -}}
 {{ $ENABLE_TCC := .Env.ENABLE_TCC | default "true" | toBool -}}
 {{ $ENABLE_TCC := .Env.ENABLE_TCC | default "true" | toBool -}}
 {{ $ENABLE_TRANSCRIPTIONS := .Env.ENABLE_TRANSCRIPTIONS | default "false" | toBool -}}
 {{ $ENABLE_TRANSCRIPTIONS := .Env.ENABLE_TRANSCRIPTIONS | default "false" | toBool -}}
-{{ $P2P_USE_STUN_TURN := .Env.P2P_USE_STUN_TURN | default "true" | toBool -}}
 {{ $RESOLUTION := .Env.RESOLUTION | default "720" -}}
 {{ $RESOLUTION := .Env.RESOLUTION | default "720" -}}
 {{ $RESOLUTION_MIN := .Env.RESOLUTION_MIN | default "180" -}}
 {{ $RESOLUTION_MIN := .Env.RESOLUTION_MIN | default "180" -}}
 {{ $RESOLUTION_WIDTH := .Env.RESOLUTION_WIDTH | default "1280" -}}
 {{ $RESOLUTION_WIDTH := .Env.RESOLUTION_WIDTH | default "1280" -}}
@@ -27,7 +26,6 @@
 {{ $START_VIDEO_MUTED := .Env.START_VIDEO_MUTED | default 10 -}}
 {{ $START_VIDEO_MUTED := .Env.START_VIDEO_MUTED | default 10 -}}
 {{ $TESTING_OCTO_PROBABILITY := .Env.TESTING_OCTO_PROBABILITY | default "0" -}}
 {{ $TESTING_OCTO_PROBABILITY := .Env.TESTING_OCTO_PROBABILITY | default "0" -}}
 {{ $TESTING_CAP_SCREENSHARE_BITRATE := .Env.TESTING_CAP_SCREENSHARE_BITRATE | default "1" -}}
 {{ $TESTING_CAP_SCREENSHARE_BITRATE := .Env.TESTING_CAP_SCREENSHARE_BITRATE | default "1" -}}
-{{ $USE_STUN_TURN := .Env.USE_STUN_TURN | default "true" | toBool -}}
 {{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN -}}
 {{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN -}}
 {{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN -}}
 {{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN -}}
 
 
@@ -66,7 +64,6 @@ config.startAudioMuted = {{ $START_AUDIO_MUTED }};
 if (!config.hasOwnProperty('p2p')) config.p2p = {};
 if (!config.hasOwnProperty('p2p')) config.p2p = {};
 
 
 config.p2p.enabled = {{ $ENABLE_P2P }};
 config.p2p.enabled = {{ $ENABLE_P2P }};
-config.p2p.useStunTurn = {{ $P2P_USE_STUN_TURN }};
 
 
 
 
 // Etherpad
 // Etherpad
@@ -246,9 +243,6 @@ config.openBridgeChannel = '{{ $BRIDGE_CHANNEL }}';
 // Enable IPv6 support.
 // Enable IPv6 support.
 config.useIPv6 = {{ $ENABLE_IPV6 }};
 config.useIPv6 = {{ $ENABLE_IPV6 }};
 
 
-// Use XEP-0215 to fetch STUN and TURN servers.
-config.useStunTurn = {{ $USE_STUN_TURN }};
-
 // Transcriptions (subtitles and buttons can be configured in interface_config)
 // Transcriptions (subtitles and buttons can be configured in interface_config)
 config.transcribingEnabled = {{ $ENABLE_TRANSCRIPTIONS }};
 config.transcribingEnabled = {{ $ENABLE_TRANSCRIPTIONS }};