kjg/cdist-contrib
1
0
Fork 0
forked from ungleich-public/cdist-contrib
Code Issues Pull requests Projects Releases Wiki Activity

jitsi: uncommitted updates to 10888

Browse source
This commit is contained in:
evilham 2026-07-31 13:23:34 +02:00
commit 0d75d44551
Signed by untrusted user: evilham
GPG key ID: AE3EE30D970886BF
6 changed files with 66 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh
View file

@ -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_10710"
BRANCH="jitsi-meet_10888"
REPO="https://github.com/jitsi/jitsi-meet"
get_url() {

32
type/__jitsi_meet_domain/files/config.js.sh
View file

@ -519,6 +519,15 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi)
// // ./src/react/features/transcribing/transcriber-langs.json.
// preferredLanguage: 'en-US',
// Allows extending the list of supported transcription languages.
// Useful for custom transcription backends (e.g. Vosk).
//
// Example:
// customLanguages: {
// 'hsb-DE': 'Upper Sorbian (Germany)',
// 'dsb-DE': 'Lower Sorbian (Germany)'
// },
// // Enables automatic turning on transcribing when recording is started
// autoTranscribeOnRecord: false,
@ -645,21 +654,6 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi)
// sticky: 0,
// },
// // Options for the recording limit notification.
// recordingLimit: {
//
// // The recording limit in minutes. Note: This number appears in the notification text
// // but doesn't enforce the actual recording time limit. This should be configured in
// // jibri!
// limit: 60,
//
// // The name of the app with unlimited recordings.
// appName: 'Unlimited recordings APP',
//
// // The URL of the app with unlimited recordings.
// appURL: 'https://unlimited.recordings.app.com/',
// },
// Disables or enables RTX (RFC 4588) (defaults to false).
// disableRtx: false,
@ -935,6 +929,9 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi)
// [ 'microphone', 'camera' ]
// ],
// Enable reduced UI on web.
// reducedUIEnabled: true,
// Overrides the buttons displayed in the main toolbar for reduced UI.
// When there isn't an override for a certain configuration the default jitsi-meet configuration will be used.
// The order of the buttons in the array is preserved.
@ -1602,14 +1599,13 @@ ${ANALYTICS_SETTINGS}
// - electron=true (when web is loaded in electron app)
// If there is a logout service you can specify its URL with:
// tokenLogoutUrl: 'https://myservice.com/logout'
// You can enable tokenAuthUrlAutoRedirect which will detect that you have logged in successfully before
// and will automatically redirect to the token service to get the token for the meeting.
// tokenAuthUrlAutoRedirect: false
// An option to respect the context.tenant jwt field compared to the current tenant from the url
// tokenRespectTenant: false,
// An option to get for user info (name, picture, email) in the token outside the user context.
// Can be used with Firebase tokens.
// tokenGetUserInfoOutOfContext: false,
// An option to pass the token in the iframe API directly instead of using the redirect flow.
// tokenAuthInline: false,
// You can put an array of values to target different entity types in the invite dialog.
// Valid values are "phone", "room", "sip", "user", "videosipgw" and "email"

32
type/__jitsi_meet_domain/files/config.js.sh.orig
View file

@ -511,6 +511,15 @@ var config = {
// // ./src/react/features/transcribing/transcriber-langs.json.
// preferredLanguage: 'en-US',
// Allows extending the list of supported transcription languages.
// Useful for custom transcription backends (e.g. Vosk).
//
// Example:
// customLanguages: {
// 'hsb-DE': 'Upper Sorbian (Germany)',
// 'dsb-DE': 'Lower Sorbian (Germany)'
// },
// // Enables automatic turning on transcribing when recording is started
// autoTranscribeOnRecord: false,
@ -637,21 +646,6 @@ var config = {
// sticky: 0,
// },
// // Options for the recording limit notification.
// recordingLimit: {
//
// // The recording limit in minutes. Note: This number appears in the notification text
// // but doesn't enforce the actual recording time limit. This should be configured in
// // jibri!
// limit: 60,
//
// // The name of the app with unlimited recordings.
// appName: 'Unlimited recordings APP',
//
// // The URL of the app with unlimited recordings.
// appURL: 'https://unlimited.recordings.app.com/',
// },
// Disables or enables RTX (RFC 4588) (defaults to false).
// disableRtx: false,
@ -927,6 +921,9 @@ var config = {
// [ 'microphone', 'camera' ]
// ],
// Enable reduced UI on web.
// reducedUIEnabled: true,
// Overrides the buttons displayed in the main toolbar for reduced UI.
// When there isn't an override for a certain configuration the default jitsi-meet configuration will be used.
// The order of the buttons in the array is preserved.
@ -1589,14 +1586,13 @@ var config = {
// - electron=true (when web is loaded in electron app)
// If there is a logout service you can specify its URL with:
// tokenLogoutUrl: 'https://myservice.com/logout'
// You can enable tokenAuthUrlAutoRedirect which will detect that you have logged in successfully before
// and will automatically redirect to the token service to get the token for the meeting.
// tokenAuthUrlAutoRedirect: false
// An option to respect the context.tenant jwt field compared to the current tenant from the url
// tokenRespectTenant: false,
// An option to get for user info (name, picture, email) in the token outside the user context.
// Can be used with Firebase tokens.
// tokenGetUserInfoOutOfContext: false,
// An option to pass the token in the iframe API directly instead of using the redirect flow.
// tokenAuthInline: false,
// You can put an array of values to target different entity types in the invite dialog.
// Valid values are "phone", "room", "sip", "user", "videosipgw" and "email"

2
type/__jitsi_meet_domain/files/jitsi-version
View file

@ -1 +1 @@
2.0.10710-1
2.0.10888-1

18
type/__jitsi_meet_domain/files/nginx.sh
View file

@ -38,6 +38,22 @@ JITSI_NGINX_CONFIG="$(cat <<EOF
# v7 v7;
# v8 v8;
#}
# Matches any URI or Referer with some matches and redacts the whole
# query string. log_format and map must be at the http context level.
#map \$request_uri \$loggable_uri {
# ~^(?P<path>[^?]*)\?.*(?:jwt|token)= "\${path}?[params_redacted]";
# default \$request_uri;
#}
#
#map \$http_referer \$loggable_referer {
# ~^(?P<url>[^?]*)\?.*(?:jwt|token)= "\${url}?[params_redacted]";
# default \$http_referer;
#}
#
#log_format jitsi_log '\$remote_addr - \$remote_user [\$time_local] '
# '"\$request_method \$loggable_uri \$server_protocol" '
# '\$status \$body_bytes_sent "\$loggable_referer" "\$http_user_agent"';
server {
listen 80;
listen [::]:80;
@ -77,6 +93,8 @@ server {
root /usr/share/jitsi-meet;
# access_log /var/log/nginx/access.log jitsi_log;
# ssi on with javascript for multidomain variables in config.js
ssi on;
ssi_types application/x-javascript application/javascript;

18
type/__jitsi_meet_domain/files/nginx.sh.orig
View file

@ -26,6 +26,22 @@ map $arg_vnode $prosody_node {
v7 v7;
v8 v8;
}
# Matches any URI or Referer with some matches and redacts the whole
# query string. log_format and map must be at the http context level.
map $request_uri $loggable_uri {
~^(?P<path>[^?]*)\?.*(?:jwt|token)= "${path}?[params_redacted]";
default $request_uri;
}
map $http_referer $loggable_referer {
~^(?P<url>[^?]*)\?.*(?:jwt|token)= "${url}?[params_redacted]";
default $http_referer;
}
log_format jitsi_log '$remote_addr - $remote_user [$time_local] '
'"$request_method $loggable_uri $server_protocol" '
'$status $body_bytes_sent "$loggable_referer" "$http_user_agent"';
server {
listen 80;
listen [::]:80;
@ -66,6 +82,8 @@ server {
root /usr/share/jitsi-meet;
access_log /var/log/nginx/access.log jitsi_log;
# ssi on with javascript for multidomain variables in config.js
ssi on;
ssi_types application/x-javascript application/javascript;