[__jitsi_meet*] Update to 2.0.7287-1
Sponsored by: camilion.eu, eXO.cat
This commit is contained in:
parent
797f7c8648
commit
756e5b17c6
6 changed files with 102 additions and 10 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
# We could automate this, but are using it as an indicator for the
|
# We could automate this, but are using it as an indicator for the
|
||||||
# latest branch with which we conciliated changes.
|
# latest branch with which we conciliated changes.
|
||||||
BRANCH="jitsi-meet_7210"
|
BRANCH="jitsi-meet_7287"
|
||||||
REPO="https://github.com/jitsi/jitsi-meet"
|
REPO="https://github.com/jitsi/jitsi-meet"
|
||||||
|
|
||||||
get_url() {
|
get_url() {
|
||||||
|
|
|
@ -4,6 +4,11 @@
|
||||||
JITSI_CONFIG_JS="$(cat <<EOF
|
JITSI_CONFIG_JS="$(cat <<EOF
|
||||||
/* eslint-disable no-unused-vars, no-var */
|
/* eslint-disable no-unused-vars, no-var */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* NOTE: If you add a new option please remember to document it here:
|
||||||
|
* https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-configuration
|
||||||
|
*/
|
||||||
|
|
||||||
var config = {
|
var config = {
|
||||||
// Connection
|
// Connection
|
||||||
//
|
//
|
||||||
|
@ -75,6 +80,11 @@ var config = {
|
||||||
// or disabled for the screenshare.
|
// or disabled for the screenshare.
|
||||||
// capScreenshareBitrate: 1 // 0 to disable - deprecated.
|
// capScreenshareBitrate: 1 // 0 to disable - deprecated.
|
||||||
|
|
||||||
|
// Whether to use fake constraints (height: 99999, width: 99999) when calling getDisplayMedia on
|
||||||
|
// Chromium based browsers. This is intended as a workaround for
|
||||||
|
// https://bugs.chromium.org/p/chromium/issues/detail?id=1056311
|
||||||
|
// setScreenSharingResolutionConstraints: true
|
||||||
|
|
||||||
// Enable callstats only for a percentage of users.
|
// Enable callstats only for a percentage of users.
|
||||||
// This takes a value between 0 and 100 which determines the probability for
|
// This takes a value between 0 and 100 which determines the probability for
|
||||||
// the callstats to be enabled.
|
// the callstats to be enabled.
|
||||||
|
@ -1101,8 +1111,18 @@ ${ANALYTICS_SETTINGS}
|
||||||
// breakoutRooms: {
|
// breakoutRooms: {
|
||||||
// // Hides the add breakout room button. This replaces \`hideAddRoomButton\`.
|
// // Hides the add breakout room button. This replaces \`hideAddRoomButton\`.
|
||||||
// hideAddRoomButton: false,
|
// hideAddRoomButton: false,
|
||||||
|
// // Hides the auto assign participants button.
|
||||||
|
// hideAutoAssignButton: false,
|
||||||
|
// // Hides the participants pane footer menu.
|
||||||
|
// hideFooterMenu: false,
|
||||||
// // Hides the join breakout room button.
|
// // Hides the join breakout room button.
|
||||||
// hideJoinRoomButton: false
|
// hideJoinRoomButton: false,
|
||||||
|
// // Hides the moderator settings tab.
|
||||||
|
// hideModeratorSettingsTab: false,
|
||||||
|
// // Hides the more actions button.
|
||||||
|
// hideMoreActionsButton: false,
|
||||||
|
// // Hides the mute all button.
|
||||||
|
// hideMuteAllButton: false
|
||||||
// },
|
// },
|
||||||
|
|
||||||
// When true the user cannot add more images to be used as virtual background.
|
// When true the user cannot add more images to be used as virtual background.
|
||||||
|
@ -1131,7 +1151,7 @@ ${ANALYTICS_SETTINGS}
|
||||||
// If a label's id is not in any of the 2 arrays, it will not be visible at all on the header.
|
// If a label's id is not in any of the 2 arrays, it will not be visible at all on the header.
|
||||||
// conferenceInfo: {
|
// conferenceInfo: {
|
||||||
// // those labels will not be hidden in tandem with the toolbox.
|
// // those labels will not be hidden in tandem with the toolbox.
|
||||||
// alwaysVisible: ['recording', 'local-recording', 'raised-hands-count'],
|
// alwaysVisible: ['recording', 'raised-hands-count'],
|
||||||
// // those labels will be auto-hidden in tandem with the toolbox buttons.
|
// // those labels will be auto-hidden in tandem with the toolbox buttons.
|
||||||
// autoHide: [
|
// autoHide: [
|
||||||
// 'subject',
|
// 'subject',
|
||||||
|
@ -1175,14 +1195,24 @@ ${ANALYTICS_SETTINGS}
|
||||||
// will open an etherpad document.
|
// will open an etherpad document.
|
||||||
// etherpad_base: 'https://your-etherpad-installati.on/p/',
|
// etherpad_base: 'https://your-etherpad-installati.on/p/',
|
||||||
|
|
||||||
|
// To enable information about dial-in access to meetings you need to provide
|
||||||
|
// dialInNumbersUrl and dialInConfCodeUrl.
|
||||||
|
// dialInNumbersUrl returns a json array of numbers that can be used for dial-in.
|
||||||
|
// {"countryCode":"US","tollFree":false,"formattedNumber":"+1 123-456-7890"}
|
||||||
|
// dialInConfCodeUrl is the conference mapper converting a meeting id to a PIN used for dial-in
|
||||||
|
// or the other way around (more info in resources/cloud-api.swagger)
|
||||||
|
//
|
||||||
|
// For JaaS customers the default values are:
|
||||||
|
// dialInNumbersUrl: 'https://conference-mapper.jitsi.net/v1/access/dids',
|
||||||
|
// dialInConfCodeUrl: 'https://conference-mapper.jitsi.net/v1/access',
|
||||||
|
//
|
||||||
|
|
||||||
// List of undocumented settings used in jitsi-meet
|
// List of undocumented settings used in jitsi-meet
|
||||||
/**
|
/**
|
||||||
_immediateReloadThreshold
|
_immediateReloadThreshold
|
||||||
debug
|
debug
|
||||||
debugAudioLevels
|
debugAudioLevels
|
||||||
deploymentInfo
|
deploymentInfo
|
||||||
dialInConfCodeUrl
|
|
||||||
dialInNumbersUrl
|
|
||||||
dialOutAuthUrl
|
dialOutAuthUrl
|
||||||
dialOutCodesUrl
|
dialOutCodesUrl
|
||||||
disableRemoteControl
|
disableRemoteControl
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
|
|
||||||
/* eslint-disable no-unused-vars, no-var */
|
/* eslint-disable no-unused-vars, no-var */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* NOTE: If you add a new option please remember to document it here:
|
||||||
|
* https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-configuration
|
||||||
|
*/
|
||||||
|
|
||||||
var config = {
|
var config = {
|
||||||
// Connection
|
// Connection
|
||||||
//
|
//
|
||||||
|
@ -69,6 +74,11 @@ var config = {
|
||||||
// or disabled for the screenshare.
|
// or disabled for the screenshare.
|
||||||
// capScreenshareBitrate: 1 // 0 to disable - deprecated.
|
// capScreenshareBitrate: 1 // 0 to disable - deprecated.
|
||||||
|
|
||||||
|
// Whether to use fake constraints (height: 99999, width: 99999) when calling getDisplayMedia on
|
||||||
|
// Chromium based browsers. This is intended as a workaround for
|
||||||
|
// https://bugs.chromium.org/p/chromium/issues/detail?id=1056311
|
||||||
|
// setScreenSharingResolutionConstraints: true
|
||||||
|
|
||||||
// Enable callstats only for a percentage of users.
|
// Enable callstats only for a percentage of users.
|
||||||
// This takes a value between 0 and 100 which determines the probability for
|
// This takes a value between 0 and 100 which determines the probability for
|
||||||
// the callstats to be enabled.
|
// the callstats to be enabled.
|
||||||
|
@ -1093,8 +1103,18 @@ var config = {
|
||||||
// breakoutRooms: {
|
// breakoutRooms: {
|
||||||
// // Hides the add breakout room button. This replaces `hideAddRoomButton`.
|
// // Hides the add breakout room button. This replaces `hideAddRoomButton`.
|
||||||
// hideAddRoomButton: false,
|
// hideAddRoomButton: false,
|
||||||
|
// // Hides the auto assign participants button.
|
||||||
|
// hideAutoAssignButton: false,
|
||||||
|
// // Hides the participants pane footer menu.
|
||||||
|
// hideFooterMenu: false,
|
||||||
// // Hides the join breakout room button.
|
// // Hides the join breakout room button.
|
||||||
// hideJoinRoomButton: false
|
// hideJoinRoomButton: false,
|
||||||
|
// // Hides the moderator settings tab.
|
||||||
|
// hideModeratorSettingsTab: false,
|
||||||
|
// // Hides the more actions button.
|
||||||
|
// hideMoreActionsButton: false,
|
||||||
|
// // Hides the mute all button.
|
||||||
|
// hideMuteAllButton: false
|
||||||
// },
|
// },
|
||||||
|
|
||||||
// When true the user cannot add more images to be used as virtual background.
|
// When true the user cannot add more images to be used as virtual background.
|
||||||
|
@ -1123,7 +1143,7 @@ var config = {
|
||||||
// If a label's id is not in any of the 2 arrays, it will not be visible at all on the header.
|
// If a label's id is not in any of the 2 arrays, it will not be visible at all on the header.
|
||||||
// conferenceInfo: {
|
// conferenceInfo: {
|
||||||
// // those labels will not be hidden in tandem with the toolbox.
|
// // those labels will not be hidden in tandem with the toolbox.
|
||||||
// alwaysVisible: ['recording', 'local-recording', 'raised-hands-count'],
|
// alwaysVisible: ['recording', 'raised-hands-count'],
|
||||||
// // those labels will be auto-hidden in tandem with the toolbox buttons.
|
// // those labels will be auto-hidden in tandem with the toolbox buttons.
|
||||||
// autoHide: [
|
// autoHide: [
|
||||||
// 'subject',
|
// 'subject',
|
||||||
|
@ -1167,14 +1187,24 @@ var config = {
|
||||||
// will open an etherpad document.
|
// will open an etherpad document.
|
||||||
// etherpad_base: 'https://your-etherpad-installati.on/p/',
|
// etherpad_base: 'https://your-etherpad-installati.on/p/',
|
||||||
|
|
||||||
|
// To enable information about dial-in access to meetings you need to provide
|
||||||
|
// dialInNumbersUrl and dialInConfCodeUrl.
|
||||||
|
// dialInNumbersUrl returns a json array of numbers that can be used for dial-in.
|
||||||
|
// {"countryCode":"US","tollFree":false,"formattedNumber":"+1 123-456-7890"}
|
||||||
|
// dialInConfCodeUrl is the conference mapper converting a meeting id to a PIN used for dial-in
|
||||||
|
// or the other way around (more info in resources/cloud-api.swagger)
|
||||||
|
//
|
||||||
|
// For JaaS customers the default values are:
|
||||||
|
// dialInNumbersUrl: 'https://conference-mapper.jitsi.net/v1/access/dids',
|
||||||
|
// dialInConfCodeUrl: 'https://conference-mapper.jitsi.net/v1/access',
|
||||||
|
//
|
||||||
|
|
||||||
// List of undocumented settings used in jitsi-meet
|
// List of undocumented settings used in jitsi-meet
|
||||||
/**
|
/**
|
||||||
_immediateReloadThreshold
|
_immediateReloadThreshold
|
||||||
debug
|
debug
|
||||||
debugAudioLevels
|
debugAudioLevels
|
||||||
deploymentInfo
|
deploymentInfo
|
||||||
dialInConfCodeUrl
|
|
||||||
dialInNumbersUrl
|
|
||||||
dialOutAuthUrl
|
dialOutAuthUrl
|
||||||
dialOutCodesUrl
|
dialOutCodesUrl
|
||||||
disableRemoteControl
|
disableRemoteControl
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
2.0.7210-1
|
2.0.7287-1
|
|
@ -198,6 +198,23 @@ Component "lobby.${JITSI_DOMAIN:?}" "muc"
|
||||||
}
|
}
|
||||||
${PROSODY_DOMAIN_END}
|
${PROSODY_DOMAIN_END}
|
||||||
|
|
||||||
|
--[[
|
||||||
|
-- Enabled dial-in for JaaS customers
|
||||||
|
-- Note: make sure you have the following packages installed: lua-basexx, liblua5.3-dev, libssl-dev, luarocks
|
||||||
|
-- and execute $ sudo luarocks install luajwtjitsi 3.0-0
|
||||||
|
VirtualHost "jigasi.meet.jitsi"
|
||||||
|
enabled = false -- JaaS customers remove this line
|
||||||
|
modules_enabled = {
|
||||||
|
"ping";
|
||||||
|
"bosh";
|
||||||
|
}
|
||||||
|
authentication = "token"
|
||||||
|
app_id = "jitsi";
|
||||||
|
asap_key_server = "https://jaas-public-keys.jitsi.net/jitsi-components/prod-8x8"
|
||||||
|
asap_accepted_issuers = { "jaas-components" }
|
||||||
|
asap_accepted_audiences = { "jigasi.jitmeet.example.com" }
|
||||||
|
--]]
|
||||||
|
|
||||||
${PROSODY_SECUREDOMAIN_START}
|
${PROSODY_SECUREDOMAIN_START}
|
||||||
-- Only used on secured domains
|
-- Only used on secured domains
|
||||||
VirtualHost "${JITSI_DOMAIN}"
|
VirtualHost "${JITSI_DOMAIN}"
|
||||||
|
|
|
@ -137,3 +137,18 @@ Component "lobby.jitmeet.example.com" "muc"
|
||||||
"muc_rate_limit";
|
"muc_rate_limit";
|
||||||
"polls";
|
"polls";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-- Enabled dial-in for JaaS customers
|
||||||
|
-- Note: make sure you have the following packages installed: lua-basexx, liblua5.3-dev, libssl-dev, luarocks
|
||||||
|
-- and execute $ sudo luarocks install luajwtjitsi 3.0-0
|
||||||
|
VirtualHost "jigasi.meet.jitsi"
|
||||||
|
enabled = false -- JaaS customers remove this line
|
||||||
|
modules_enabled = {
|
||||||
|
"ping";
|
||||||
|
"bosh";
|
||||||
|
}
|
||||||
|
authentication = "token"
|
||||||
|
app_id = "jitsi";
|
||||||
|
asap_key_server = "https://jaas-public-keys.jitsi.net/jitsi-components/prod-8x8"
|
||||||
|
asap_accepted_issuers = { "jaas-components" }
|
||||||
|
asap_accepted_audiences = { "jigasi.jitmeet.example.com" }
|
||||||
|
|
Loading…
Reference in a new issue