ATTENTION: we are currently upgrading gitlabs storage backend for repositories. This may cause unavailability and in unlikely cases also data loss. Therefore, we recommend to keep local copies of all repos. Issues, Milestones, and other features of gitlab are not affected.

Commit ab8db3b9 authored by Joerg Domaschka's avatar Joerg Domaschka

Merge branch 'management-146' into 'v2.2.x'

config changes for 2.2.29

See merge request !38
parents 07ff03e9 d1691788
Pipeline #97037 canceled with stage
in 2 minutes and 15 seconds
......@@ -8,6 +8,8 @@ map $remote_addr $freeswitch_private_addr {
default ${BBB_LOCALIP};
}
server_tokens off;
server {
listen 80;
listen [::]:80;
......
......@@ -11,8 +11,8 @@ kurento:
request_timeout: 30000
response_timeout: 30000
# Number of attemps of connecting to the configured kurento instances the first
# time. Infinity means it tries forever until it's able to connect. Default is 10.
kurentoStartupRetries: 10
# time. Infinity means it tries forever until it's able to connect. Default is Infinity.
kurentoStartupRetries: 50
# balancing-strategy: can be either ROUND_ROBIN or MEDIA_TYPE. The MEDIA_TYPE only
# works properly if you annotated the configured kurento instances in the
# 'kurento' config parameter with a mediaType field (main|audio|content) which
......@@ -45,6 +45,7 @@ common-message-version: 2.x
screenshareKeyframeInterval: 0
screenshareEnableFlashRTPBridge: false
screenshareSubscriberSpecSlave: false
screensharePlayStartEnabled: false
videoSubscriberSpecSlave: false
recordScreenSharing: true
recordWebcams: true
......
......@@ -11,7 +11,7 @@ public:
appName: BigBlueButton (Ulm University) HTML5 Client
bbbServerVersion: 2.2
copyright: "©2020 BigBlueButton Inc., Ulm University 2020"
html5ClientBuild: 1058
html5ClientBuild: 1081
helpLink: https://www.uni-ulm.de/index.php?id=113758
lockOnJoin: true
cdn: ""
......@@ -277,6 +277,7 @@ public:
stunTurnServersFetchAddress: "/bigbluebutton/api/stuns"
cacheStunTurnServers: true
fallbackStunServer: ''
recvonlyIceGatheringCheck: true
mediaTag: "#remote-media"
callTransferTimeout: 5000
callHangupTimeout: 2000
......@@ -284,6 +285,13 @@ public:
echoTestNumber: "echo"
relayOnlyOnReconnect: false
listenOnlyCallTimeout: 25000
#Timeout (ms) for gathering ICE candidates. When this timeout expires
#the SDP is sent to the server with the candidates the browser gathered
#so far. Increasing this value might help avoiding 1004 error when
#user activates microphone.
iceGatheringTimeout: 10000
sipjsHackViaWs: false
presentation:
defaultPresentationFile: default.pdf
panZoomThrottle: 32
......
server_tokens off;
server {
listen 80;
listen [::]:80;
......
......@@ -2,12 +2,13 @@
set -x
CONTAINER_ID=5abbb801167f
OLD_HOSTNAME=06a2219cc7e2
OLD_SALT=VHvvFbiFjhYqKF8z7l2UnENYbLt0hy8j5tAywPpcl0
OLD_IP=172.17.0.13
OLD_API_KEY=lsXEMuGi388l1GbZyamwgfGYgkdSIWHdHz51XZtku5NKsLY6JcjcHf4tFjrD3
OLD_ESL_PASSWORD=bc4a30065fa1a264
CONTAINER_ID=d972c2392f5
# replace this with the content of the "+" lines
OLD_HOSTNAME=352f34cdfd28
OLD_SALT=GQLUGVm8bb9VrsaYl76YxV1Y2itwzt7Th4jbBy51dpIc0DaKTyVJeSdDQhE9m
OLD_IP=172.17.0.8
OLD_API_KEY=KCr8C1FUQfc7PE6aid8HX4iirtWt8kIs0o72oGbcUjXp97lUF0dmCkOzmxv5
OLD_ESL_PASSWORD=7980115f30abd8c0
LOCALDIR=$(dirname $0)
......
......@@ -11,8 +11,8 @@ kurento:
request_timeout: 30000
response_timeout: 30000
# Number of attemps of connecting to the configured kurento instances the first
# time. Infinity means it tries forever until it's able to connect. Default is 10.
kurentoStartupRetries: 10
# time. Infinity means it tries forever until it's able to connect. Default is Infinity.
kurentoStartupRetries: Infinity
# balancing-strategy: can be either ROUND_ROBIN or MEDIA_TYPE. The MEDIA_TYPE only
# works properly if you annotated the configured kurento instances in the
# 'kurento' config parameter with a mediaType field (main|audio|content) which
......@@ -45,6 +45,7 @@ common-message-version: 2.x
screenshareKeyframeInterval: 0
screenshareEnableFlashRTPBridge: false
screenshareSubscriberSpecSlave: false
screensharePlayStartEnabled: false
videoSubscriberSpecSlave: false
recordScreenSharing: true
recordWebcams: true
......
......@@ -44,7 +44,7 @@ expire {
services {
bbbWebAPI="https://e61f754055a1/bigbluebutton/api"
sharedSecret="uV09FE1gjgSpsuBAF1GEfldFbwVe2iPFvsUBa0Q100Q"
sharedSecret="BShhWLQ3FvI2RggWlvavChbhykTiJ9smZHYzEgzCA"
}
red5 {
......
......@@ -269,7 +269,7 @@ defaultConfigURL=${bigbluebutton.web.serverURL}/client/conf/config.xml
apiVersion=2.0
# Salt which is used by 3rd-party apps to authenticate api calls
securitySalt=uV09FE1gjgSpsuBAF1GEfldFbwVe2iPFvsUBa0Q100Q
securitySalt=BShhWLQ3FvI2RggWlvavChbhykTiJ9smZHYzEgzCA
# Directory where we drop the <meeting-id-recorded>.done file
recordStatusDir=/var/bigbluebutton/recording/status/recorded
......
......@@ -25,7 +25,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
">
<bean id="stun1" class="org.bigbluebutton.web.services.turn.StunServer">
<constructor-arg index="0" value="stun:stun.freeswitch.org"/>
<constructor-arg index="0" value="stun:stun.l.google.com:19302"/>
</bean>
<!--bean id="stun2" class="org.bigbluebutton.web.services.turn.StunServer">
......
......@@ -11,7 +11,7 @@ public:
appName: BigBlueButton HTML5 Client
bbbServerVersion: 2.2
copyright: "©2020 BigBlueButton Inc."
html5ClientBuild: 1058
html5ClientBuild: 1081
helpLink: https://bigbluebutton.org/html5/
lockOnJoin: true
cdn: ""
......@@ -277,6 +277,7 @@ public:
stunTurnServersFetchAddress: "/bigbluebutton/api/stuns"
cacheStunTurnServers: true
fallbackStunServer: ''
recvonlyIceGatheringCheck: true
mediaTag: "#remote-media"
callTransferTimeout: 5000
callHangupTimeout: 2000
......@@ -284,6 +285,12 @@ public:
echoTestNumber: 'echo'
relayOnlyOnReconnect: false
listenOnlyCallTimeout: 25000
#Timeout (ms) for gathering ICE candidates. When this timeout expires
#the SDP is sent to the server with the candidates the browser gathered
#so far. Increasing this value might help avoiding 1004 error when
#user activates microphone.
iceGatheringTimeout: 5000
sipjsHackViaWs: false
presentation:
defaultPresentationFile: default.pdf
panZoomThrottle: 32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment