From 8763095e5064ca8cb2e82ed8658416bd2d832557 Mon Sep 17 00:00:00 2001 From: Evilham Date: Wed, 27 Aug 2025 11:43:47 +0200 Subject: [PATCH] __jitsi_meet: upgrade to 2.0.10431 --- .../files/_update_jitsi_configurations.sh | 2 +- type/__jitsi_meet_domain/files/config.js.sh | 39 ++++++++++++------- .../files/config.js.sh.orig | 39 ++++++++++++------- type/__jitsi_meet_domain/files/jitsi-version | 2 +- .../files/prosody.cfg.lua.sh | 12 ++---- .../files/prosody.cfg.lua.sh.orig | 12 ++---- 6 files changed, 58 insertions(+), 48 deletions(-) diff --git a/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh b/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh index 2f93b72..9355ed2 100755 --- a/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh +++ b/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh @@ -7,7 +7,7 @@ # We could automate this, but are using it as an indicator for the # latest branch with which we conciliated changes. -BRANCH="jitsi-meet_10314" +BRANCH="jitsi-meet_10431" REPO="https://github.com/jitsi/jitsi-meet" get_url() { diff --git a/type/__jitsi_meet_domain/files/config.js.sh b/type/__jitsi_meet_domain/files/config.js.sh index a763784..7555b68 100644 --- a/type/__jitsi_meet_domain/files/config.js.sh +++ b/type/__jitsi_meet_domain/files/config.js.sh @@ -124,6 +124,11 @@ var config = { // Will replace ice candidates IPs with invalid ones in order to fail ice. // failICE: true, + + // When running on Spot TV, this controls whether to show the recording consent dialog. + // If false (default), Spot instances will not show the recording consent dialog. + // If true, Spot instances will show the recording consent dialog like regular clients. + // showSpotConsentDialog: false, }, // Disables moderator indicators. @@ -519,7 +524,8 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // // Note: Starting transcriptions from the recording dialog will still work. // disableClosedCaptions: false, - // // Whether to invite jigasi when backend transcriptions are enabled. By default, we invite it. + // // Whether to invite jigasi when backend transcriptions are enabled (asyncTranscription is true in metadata). + // // By default, we invite it. // inviteJigasiOnBackendTranscribing: true, // }, @@ -1134,10 +1140,6 @@ ${ANALYTICS_SETTINGS} // The Amplitude APP Key: // amplitudeAPPKey: '', - // Enables Amplitude UTM tracking: - // Default value is false. - // amplitudeIncludeUTM: false, - // Obfuscates room name sent to analytics (amplitude, rtcstats) // Default value is false. // obfuscateRoomName: false, @@ -1372,18 +1374,11 @@ ${ANALYTICS_SETTINGS} // disableKick: true, // // If set to true the 'Grant moderator' button will be disabled. // disableGrantModerator: true, - // // If set to true the 'Send private message' button will be disabled. - // disablePrivateChat: true, + // // If set to 'all' the 'Private chat' button will be disabled for all participants. + // // If set to 'allow-moderator-chat' the 'Private chat' button will be available for chats with moderators. + // disablePrivateChat: 'all' | 'allow-moderator-chat', // }, - // Endpoint that enables support for salesforce integration with in-meeting resource linking - // This is required for: - // listing the most recent records - salesforceUrl/records/recents - // searching records - salesforceUrl/records?text=\${text} - // retrieving record details - salesforceUrl/records/\${id}?type=\${type} - // and linking the meeting - salesforceUrl/sessions/\${sessionId}/records/\${id} - // - // salesforceUrl: 'https://api.example.com/', // If set to true all muting operations of remote participants will be disabled. // disableRemoteMute: true, @@ -1408,6 +1403,13 @@ ${ANALYTICS_SETTINGS} logoClickUrl: 'https://example-company.org', // The url used for the image used as logo logoImageUrl: 'https://example.com/logo-img.png', + // Endpoint that enables support for salesforce integration with in-meeting resource linking + // This is required for: + // listing the most recent records - salesforceUrl/records/recents + // searching records - salesforceUrl/records?text=${text} + // retrieving record details - salesforceUrl/records/${id}?type=${type} + // and linking the meeting - salesforceUrl/sessions/${sessionId}/records/${id} + // salesforceUrl: 'https://api.example.com/', // Overwrite for pool of background images for avatars avatarBackgrounds: ['url(https://example.com/avatar-background-1.png)', '#FFF'], // The lobby/prejoin screen background @@ -1791,6 +1793,13 @@ ${ANALYTICS_SETTINGS} // // The minimum number of participants that must be in the call for // // the top panel layout to be used. // minParticipantCountForTopPanel: 50, + + // // The width of the filmstrip on joining meeting. Can be resized afterwards. + // initialWidth: 400, + + // // Whether the draggable resize bar of the filmstrip is always visible. Setting this to true will make + // // the filmstrip always visible in case \`disableResizable\` is false. + // alwaysShowResizeBar: true, // }, // Tile view related config options. diff --git a/type/__jitsi_meet_domain/files/config.js.sh.orig b/type/__jitsi_meet_domain/files/config.js.sh.orig index 21de0c5..23f7df6 100644 --- a/type/__jitsi_meet_domain/files/config.js.sh.orig +++ b/type/__jitsi_meet_domain/files/config.js.sh.orig @@ -117,6 +117,11 @@ var config = { // Will replace ice candidates IPs with invalid ones in order to fail ice. // failICE: true, + + // When running on Spot TV, this controls whether to show the recording consent dialog. + // If false (default), Spot instances will not show the recording consent dialog. + // If true, Spot instances will show the recording consent dialog like regular clients. + // showSpotConsentDialog: false, }, // Disables moderator indicators. @@ -511,7 +516,8 @@ var config = { // // Note: Starting transcriptions from the recording dialog will still work. // disableClosedCaptions: false, - // // Whether to invite jigasi when backend transcriptions are enabled. By default, we invite it. + // // Whether to invite jigasi when backend transcriptions are enabled (asyncTranscription is true in metadata). + // // By default, we invite it. // inviteJigasiOnBackendTranscribing: true, // }, @@ -1125,10 +1131,6 @@ var config = { // The Amplitude APP Key: // amplitudeAPPKey: '', - // Enables Amplitude UTM tracking: - // Default value is false. - // amplitudeIncludeUTM: false, - // Obfuscates room name sent to analytics (amplitude, rtcstats) // Default value is false. // obfuscateRoomName: false, @@ -1359,18 +1361,11 @@ var config = { // disableKick: true, // // If set to true the 'Grant moderator' button will be disabled. // disableGrantModerator: true, - // // If set to true the 'Send private message' button will be disabled. - // disablePrivateChat: true, + // // If set to 'all' the 'Private chat' button will be disabled for all participants. + // // If set to 'allow-moderator-chat' the 'Private chat' button will be available for chats with moderators. + // disablePrivateChat: 'all' | 'allow-moderator-chat', // }, - // Endpoint that enables support for salesforce integration with in-meeting resource linking - // This is required for: - // listing the most recent records - salesforceUrl/records/recents - // searching records - salesforceUrl/records?text=${text} - // retrieving record details - salesforceUrl/records/${id}?type=${type} - // and linking the meeting - salesforceUrl/sessions/${sessionId}/records/${id} - // - // salesforceUrl: 'https://api.example.com/', // If set to true all muting operations of remote participants will be disabled. // disableRemoteMute: true, @@ -1395,6 +1390,13 @@ var config = { logoClickUrl: 'https://example-company.org', // The url used for the image used as logo logoImageUrl: 'https://example.com/logo-img.png', + // Endpoint that enables support for salesforce integration with in-meeting resource linking + // This is required for: + // listing the most recent records - salesforceUrl/records/recents + // searching records - salesforceUrl/records?text=${text} + // retrieving record details - salesforceUrl/records/${id}?type=${type} + // and linking the meeting - salesforceUrl/sessions/${sessionId}/records/${id} + // salesforceUrl: 'https://api.example.com/', // Overwrite for pool of background images for avatars avatarBackgrounds: ['url(https://example.com/avatar-background-1.png)', '#FFF'], // The lobby/prejoin screen background @@ -1778,6 +1780,13 @@ var config = { // // The minimum number of participants that must be in the call for // // the top panel layout to be used. // minParticipantCountForTopPanel: 50, + + // // The width of the filmstrip on joining meeting. Can be resized afterwards. + // initialWidth: 400, + + // // Whether the draggable resize bar of the filmstrip is always visible. Setting this to true will make + // // the filmstrip always visible in case `disableResizable` is false. + // alwaysShowResizeBar: true, // }, // Tile view related config options. diff --git a/type/__jitsi_meet_domain/files/jitsi-version b/type/__jitsi_meet_domain/files/jitsi-version index 0983883..cb73109 100644 --- a/type/__jitsi_meet_domain/files/jitsi-version +++ b/type/__jitsi_meet_domain/files/jitsi-version @@ -1 +1 @@ -2.0.10314-1 \ No newline at end of file +2.0.10431-1 \ No newline at end of file diff --git a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh index ee60fdd..9683d07 100644 --- a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh +++ b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh @@ -97,23 +97,17 @@ VirtualHost "${JITSI_DOMAIN:?}" key = "/etc/prosody/certs/${JITSI_DOMAIN:?}.key"; certificate = "/etc/prosody/certs/${JITSI_DOMAIN:?}.crt"; } - av_moderation_component = "avmoderation.${JITSI_DOMAIN:?}" - speakerstats_component = "speakerstats.${JITSI_DOMAIN:?}" - end_conference_component = "endconference.${JITSI_DOMAIN:?}" -- we need bosh modules_enabled = { "bosh"; "websocket"; "smacks"; "ping"; -- Enable mod_ping - "speakerstats"; "external_services"; + "features_identity"; "conference_duration"; - "end_conference"; "muc_lobby_rooms"; "muc_breakout_rooms"; - "av_moderation"; - "room_metadata"; ${PROSODY_WEBSOCKET} "websocket"; ${PROSODY_WEBSOCKET} "smacks"; } @@ -124,7 +118,6 @@ ${PROSODY_WEBSOCKET} "smacks"; c2s_require_encryption = false lobby_muc = "lobby.${JITSI_DOMAIN:?}" breakout_rooms_muc = "breakout.${JITSI_DOMAIN:?}" - room_metadata_component = "metadata.${JITSI_DOMAIN:?}" main_muc = "conference.${JITSI_DOMAIN:?}" -- muc_lobby_whitelist = { "recorder.${JITSI_DOMAIN:?}" } -- Here we can whitelist jibri to enter lobby enabled rooms @@ -212,6 +205,9 @@ Component "endconference.${JITSI_DOMAIN:?}" "end_conference" Component "avmoderation.${JITSI_DOMAIN:?}" "av_moderation_component" muc_component = "conference.${JITSI_DOMAIN:?}" +Component "filesharing.${JITSI_DOMAIN:?}" "filesharing_component" + muc_component = "conference.${JITSI_DOMAIN:?}" + Component "lobby.${JITSI_DOMAIN:?}" "muc" storage = "memory" restrict_room_creation = true diff --git a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig index d794391..a98abdf 100644 --- a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig +++ b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig @@ -58,28 +58,21 @@ VirtualHost "jitmeet.example.com" key = "/etc/prosody/certs/jitmeet.example.com.key"; certificate = "/etc/prosody/certs/jitmeet.example.com.crt"; } - av_moderation_component = "avmoderation.jitmeet.example.com" - speakerstats_component = "speakerstats.jitmeet.example.com" - end_conference_component = "endconference.jitmeet.example.com" -- we need bosh modules_enabled = { "bosh"; "websocket"; "smacks"; "ping"; -- Enable mod_ping - "speakerstats"; "external_services"; + "features_identity"; "conference_duration"; - "end_conference"; "muc_lobby_rooms"; "muc_breakout_rooms"; - "av_moderation"; - "room_metadata"; } c2s_require_encryption = false lobby_muc = "lobby.jitmeet.example.com" breakout_rooms_muc = "breakout.jitmeet.example.com" - room_metadata_component = "metadata.jitmeet.example.com" main_muc = "conference.jitmeet.example.com" -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms @@ -155,6 +148,9 @@ Component "endconference.jitmeet.example.com" "end_conference" Component "avmoderation.jitmeet.example.com" "av_moderation_component" muc_component = "conference.jitmeet.example.com" +Component "filesharing.jitmeet.example.com" "filesharing_component" + muc_component = "conference.jitmeet.example.com" + Component "lobby.jitmeet.example.com" "muc" storage = "memory" restrict_room_creation = true