Skip to content

Commit e406fff

Browse files
guillaumevillemontguillaumevillemont
committed
Merge tag 'tags/stable-9955'
release * 3ba77e1 feat(prosody) - Added TURN_USERNAME and TURN_PASSWORD (jitsi#1989) * 82e98d2 web: Added P2P_STUN_SERVERS environment variable (jitsi#1990) * 02499f8 feat(grafana): prosody monitoring dashboard created (jitsi#1879) * 3af0725 web: add option param for Automatic Gain Control * 9bc57e2 misc: working on unstable
2 parents f8405e4 + 3659eb6 commit e406fff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+4354
-509
lines changed

‎.github/workflows/ci.yml

+58
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,64 @@ on:
77
- master
88

99
jobs:
10+
lint:
11+
name: Lint
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-node@v4
16+
- name: Check Node / npm versions
17+
run: |
18+
node -v
19+
npm -v
20+
- name: setup tpl
21+
run: |
22+
dpkgArch="$(dpkg --print-architecture)"
23+
case "${dpkgArch##*-}" in \
24+
"amd64") TPL_ARCH=amd64; S6_ARCH=amd64 ;; \
25+
"arm64") TPL_ARCH=arm64; S6_ARCH=aarch64 ;; \
26+
*) echo "unsupported architecture"; exit 1 ;; \
27+
esac
28+
wget -qO /tmp/tpl https://github.com/jitsi/tpl/releases/download/v1.4.0/tpl-linux-${TPL_ARCH}
29+
chmod +x /tmp/tpl
30+
- name: Run tpl with default values for web
31+
run: |
32+
/tmp/tpl web/rootfs/defaults/system-config.js > /tmp/config.js
33+
/tmp/tpl web/rootfs/defaults/settings-config.js >> /tmp/config.js
34+
- name: Check config.js syntax
35+
run: node /tmp/config.js
36+
- name: Run tpl with default values for jvb
37+
run: |
38+
/tmp/tpl jvb/rootfs/defaults/jvb.conf > /tmp/jvb.conf
39+
/tmp/tpl jvb/rootfs/defaults/logging.properties > /tmp/logging.properties
40+
/tmp/tpl jvb/rootfs/defaults/autoscaler-sidecar.config > /tmp/autoscaler-sidecar.config
41+
- name: Run tpl with default values for jicofo
42+
run: |
43+
/tmp/tpl jicofo/rootfs/defaults/jicofo.conf > /tmp/jicofo.conf
44+
/tmp/tpl jicofo/rootfs/defaults/logging.properties > /tmp/logging.properties
45+
- name: Run tpl with default values for jibri
46+
run: |
47+
/tmp/tpl jibri/rootfs/defaults/jibri.conf > /tmp/jibri.conf
48+
/tmp/tpl jibri/rootfs/defaults/logging.properties > /tmp/logging.properties
49+
/tmp/tpl jibri/rootfs/defaults/xmpp.conf > /tmp/xmpp.conf
50+
/tmp/tpl jibri/rootfs/defaults/xorg-video-dummy.conf > /tmp/xorg-video-dummy.conf
51+
/tmp/tpl jibri/rootfs/defaults/autoscaler-sidecar.config > /tmp/autoscaler-sidecar.config
52+
- name: Run tpl with default values for jigasi
53+
run: |
54+
/tmp/tpl jigasi/rootfs/defaults/sip-communicator.properties > /tmp/sip-communicator.properties
55+
/tmp/tpl jigasi/rootfs/defaults/sipserver-sip-communicator.properties > /tmp/xmpp-sip-communicator.properties
56+
/tmp/tpl jigasi/rootfs/defaults/transcriber-sip-communicator.properties > /tmp/xmpp-sip-communicator.properties
57+
/tmp/tpl jigasi/rootfs/defaults/xmpp-sip-communicator.properties > /tmp/xmpp-sip-communicator.properties
58+
/tmp/tpl jigasi/rootfs/defaults/logging.properties > /tmp/logging.properties
59+
/tmp/tpl jigasi/rootfs/defaults/autoscaler-sidecar.config > /tmp/autoscaler-sidecar.config
60+
- name: Run tpl with default values for prosody
61+
run: |
62+
/tmp/tpl prosody/rootfs/defaults/prosody.cfg.lua > /tmp/prosody.cfg.lua
63+
/tmp/tpl prosody/rootfs/defaults/saslauthd.conf > /tmp/saslauthd.conf
64+
/tmp/tpl prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua > /tmp/jitsi-meet.cfg.lua
65+
/tmp/tpl prosody/rootfs/defaults/conf.d/brewery.cfg.lua > /tmp/brewery.cfg.lua
66+
/tmp/tpl prosody/rootfs/defaults/conf.d/visitors.cfg.lua > /tmp/visitors.cfg.lua
67+
/tmp/tpl prosody/rootfs/defaults/rules.d/jvb_muc_presence_filter.pfw > /tmp/jvb_muc_presence_filter.pfw
1068
build:
1169
runs-on: ubuntu-latest
1270
steps:

‎CHANGELOG.md

+100
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,103 @@
1+
## stable-9955
2+
3+
Based on stable release 9955.
4+
5+
* 3ba77e1 feat(prosody) - Added TURN_USERNAME and TURN_PASSWORD (#1989)
6+
* 82e98d2 web: Added P2P_STUN_SERVERS environment variable (#1990)
7+
* 02499f8 feat(grafana): prosody monitoring dashboard created (#1879)
8+
* 3af0725 web: add option param for Automatic Gain Control
9+
* 9bc57e2 misc: working on unstable
10+
11+
## stable-9909
12+
13+
Based on stable release 9909.
14+
15+
* 9098202 feat(lint): add tpl lint step for each project (#1983)
16+
* 70b75f5 feat(build): Checks config.js syntax. (#1981)
17+
* f18b182 fix(web): config.js syntax errors (#1980)
18+
* eea18b1 feat: Add an option to enable VLA. (#1979)
19+
* 9527545 feat(web) Add defaults and env variables for codec preference. (#1978)
20+
* 6ae3414 feat(prosody): Sets recorder prefixes.
21+
* 07ea79a feat(prosody): Enables connection resumption for jicofo and jvb.
22+
* 5341065 Update docker-compose.yml (#1968)
23+
* 5e8b702 fix(prosody-visitors): proper variable for transcriber jid in rate limit (#1967)
24+
* d3db3a5 fix(jibri,jicofo,jigasi,prosody,web): respect previous XMPP_RECORDER_DOMAIN value if set (#1966)
25+
* 2d9c3cc feat(web): allow comment at the top of config.js to be overridden (#1964)
26+
* 9fe5b8b fix(web) Remove no longer used config setting. Av1 has already been enabled by default.
27+
* a53775c misc: working on unstable
28+
29+
## stable-9823
30+
31+
Based on stable release 9823.
32+
33+
* 51a1214 feat(jibri) bump Chrome to version 130
34+
* 345f8c2 fix(prosody,jicofo,jigasi,jibri) rename recorder domain to hidden domain
35+
* 47d974d feat(jibri,jicofo,jvb): custom hocon support via include for components that support it (#1960)
36+
* 6443c6f feat(transcriber): fix exposing transcript path in web
37+
* 74d913f feat(transcriber): flag to enable translations (#1953)
38+
* 8909050 feat(transcriber): remote config auth parameters (#1951)
39+
* bb17a29 feat(prosody): enable muc_max_participants in lobby component (#1950)
40+
* 26b6f27 fix(prosody): remove admin_adhoc module from defaults (#1948)
41+
* 4ae7438 feat(prosody): move external_services module and config to global prosody.cfg.lua (#1949)
42+
* 74a536e misc: working on unstable
43+
44+
## stable-9779
45+
46+
Based on stable release 9779.
47+
48+
* a5b719c :sparkles: allow configuration of a custom translation service (such as libretranslate) (#1946)
49+
* d6251b7 feat(jaas): updated jaas URLs (#1944)
50+
* 2a87a50 fix(jigasi): ensure tpl doesn't fail even if no JIGASI_SIP_PASSWORD is set (#1943)
51+
* 5164db7 feat(jigasi): config for jigasi in visitor mode (#1942)
52+
* a88c6e4 feat(prosody): allow s2s whitelist additions (#1940)
53+
* b89c328 fix(prosody): install the new version of jitsi-contrib/prosody-plugins
54+
* 0b75cd1 fix(transcriber): fix bosh and xmpp connections from jigasi to prosody (#1934)
55+
* 4369907 feat(jibri,jicofo,jigasi,jvb,prosody,web): trim empty list entries when splitting with splitList to allow trailing comma (#1932)
56+
* c58a9e5 feat(prosody): allow components access even after max participants is reached (#1930)
57+
* 5e1fcd8 fix(prosody): default value for PROSODY_MODE (#1929)
58+
* 7b7f101 feat(prosody): new flags to disable incoming client and server conection limits (#1928)
59+
* 02aa4f1 fix: Only set app_secret when defined. (#1925)
60+
* df0bb25 fix(prosody): install the new version of jitsi-contrib/prosody-plugins (#1926)
61+
* ff0cdc7 fix(prosody): tpl errors on container startup due to missing variables (#1924)
62+
* 905943d feat(prosody) update prosody contrib plugins from 20240117 to 20240817
63+
* 1f2b14d feat(prosody): enable recorder domain for s2s to visitor nodes to allow transcription support (#1905)
64+
* c9b6679 feat(web): mount load-test volume to expose load-test client from host (#1910)
65+
* b726312 feat(jicofo) add config parameter for ENABLE_MODERATOR_CHECKS
66+
* 2d39624 misc: working on unstable
67+
68+
## stable-9753
69+
70+
Based on stable release 9753.
71+
72+
* 9e17f95 feat(jigasi): allow unique account UID for each entry even if the same auth is used (#1917)
73+
* ad2a577 fix(jigasi): transcriber VOSK URL variable into compose file (#1916)
74+
* 6c08391 feat(jigasi): transcriber configuration supports vosk URL (#1915)
75+
* 1db83ed feat(ldap): Start and configure only if enabled.
76+
* ceb4a51 feat(prosody): Skip some modules for prosody-jvb.
77+
* e7786d5 feat(jigasi): transcriber configuration for OCI and whisper and to skip saving (#1909)
78+
* c5afcde feat(jigasi): support graceful shutdown via sidecar (#1908)
79+
* 5d40297 feat(jigasi): allow optional label for xmpp servers (#1907)
80+
* e7cb0f4 feat(jvb): autoscaler sidecar shutdown hook on finish (#1906)
81+
* b0675c0 prosody: recording metadata module (#1734)
82+
* 36b2e16 feat(web) - Added NGINX_KEEPALIVE_TIMEOUT environment variable
83+
* 24bf3e4 fix(web) add HTTPS port to URL in env.example
84+
* 2280f6b feat(web) add ability to run the web container targetting JaaS
85+
* ff49cd9 Revert "feat(jigasi): install openjdk nonheadless, currently required for dep…" (#1899)
86+
* 66c6ad8 feat(jigasi): install openjdk nonheadless, currently required for dependencies (#1895)
87+
* 3f67408 feat(jigasi,transcriber): transcriber component and jigasi configuration updates (#1881)
88+
* 3e93212 fix(jicofo): pass compose variable for jicofo transcription support (#1893)
89+
* 084266c feat(transcriber): transcriber password in env.example and gen-passwords.sh (#1894)
90+
* e1b14f2 feat(prosody): enable brewery muc modules in internal muc component (#1892)
91+
* 1889c5d fix(web): enable hidden domain when transcriptions or recordings are enabled (#1891)
92+
* 46377d4 feat(prosody): transcriber account support and flag configuration fix (#1890)
93+
* 9f2489d feat(log-analyser): updated grafana dashboards (#1885)
94+
* 1e589f3 feat(log-analyser): transfered docker logs from docker containers and updated readme (#1884)
95+
* 1f056b4 web: remove unnecessary option
96+
* f893e49 base: update tpl
97+
* 7617503 fix(log-analyser): added Jitsi network to loki service
98+
* 27150a2 feat(prometheus): Docker Daemon scraping for monitoring (#1865)
99+
* d6b64a2 misc: working on unstable
100+
1101
## stable-9646
2102

3103
Based on stable release 9646.

‎base/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN \
1414
esac && \
1515
apt-dpkg-wrap apt-get update && \
1616
apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget curl && \
17-
wget -qO /usr/bin/tpl https://github.com/jitsi/tpl/releases/download/v1.3.0/tpl-linux-${TPL_ARCH} && \
17+
wget -qO /usr/bin/tpl https://github.com/jitsi/tpl/releases/download/v1.4.0/tpl-linux-${TPL_ARCH} && \
1818
# Workaround S6 bug when /bin is a symlink
1919
wget -qO /tmp/s6.tar.gz https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-${S6_ARCH}.tar.gz && \
2020
mkdir /tmp/s6 && \

‎docker-compose.yml

+40-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3.5'
33
services:
44
# Frontend
55
web:
6-
image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9646}
6+
image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9955}
77
restart: ${RESTART_POLICY:-unless-stopped}
88
ports:
99
- '${HTTP_PORT}:80'
@@ -12,6 +12,9 @@ services:
1212
- ${CONFIG}/web:/config:Z
1313
- ${CONFIG}/web/crontabs:/var/spool/cron/crontabs:Z
1414
- ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts:Z
15+
- ${CONFIG}/web/load-test:/usr/share/jitsi-meet/load-test:Z
16+
labels:
17+
service: "jitsi-web"
1518
environment:
1619
- AMPLITUDE_ID
1720
- ANALYTICS_SCRIPT_URLS
@@ -21,6 +24,10 @@ services:
2124
- BRANDING_DATA_URL
2225
- BOSH_RELATIVE
2326
- CHROME_EXTENSION_BANNER_JSON
27+
- CODEC_ORDER_JVB
28+
- CODEC_ORDER_JVB_MOBILE
29+
- CODEC_ORDER_P2P
30+
- CODEC_ORDER_P2P_MOBILE
2431
- COLIBRI_WEBSOCKET_PORT
2532
- COLIBRI_WEBSOCKET_JVB_LOOKUP_NAME
2633
- COLIBRI_WEBSOCKET_REGEX
@@ -54,7 +61,9 @@ services:
5461
- DROPBOX_APPKEY
5562
- DROPBOX_REDIRECT_URI
5663
- DYNAMIC_BRANDING_URL
64+
- ENABLE_ADAPTIVE_MODE
5765
- ENABLE_AUDIO_PROCESSING
66+
- ENABLE_AUTOMATIC_GAIN_CONTROL
5867
- ENABLE_AUTH
5968
- ENABLE_AUTH_DOMAIN
6069
- ENABLE_BREAKOUT_ROOMS
@@ -95,6 +104,7 @@ services:
95104
- ENABLE_TALK_WHILE_MUTED
96105
- ENABLE_TCC
97106
- ENABLE_TRANSCRIPTIONS
107+
- ENABLE_VLA
98108
- ENABLE_XMPP_WEBSOCKET
99109
- ENABLE_JAAS_COMPONENTS
100110
- ETHERPAD_PUBLIC_URL
@@ -115,13 +125,15 @@ services:
115125
- MATOMO_ENDPOINT
116126
- MATOMO_SITE_ID
117127
- MICROSOFT_API_APP_CLIENT_ID
128+
- NGINX_KEEPALIVE_TIMEOUT
118129
- NGINX_RESOLVER
119130
- NGINX_WORKER_PROCESSES
120131
- NGINX_WORKER_CONNECTIONS
121132
- PEOPLE_SEARCH_URL
122133
- PREFERRED_LANGUAGE
123134
- PUBLIC_URL
124135
- P2P_PREFERRED_CODEC
136+
- P2P_STUN_SERVERS
125137
- RESOLUTION
126138
- RESOLUTION_MIN
127139
- RESOLUTION_WIDTH
@@ -132,7 +144,6 @@ services:
132144
- START_WITH_AUDIO_MUTED
133145
- START_VIDEO_MUTED
134146
- START_WITH_VIDEO_MUTED
135-
- TESTING_AV1_SUPPORT
136147
- TOKEN_AUTH_URL
137148
- TOOLBAR_BUTTONS
138149
- TRANSLATION_LANGUAGES
@@ -169,8 +180,9 @@ services:
169180
- XMPP_DOMAIN
170181
- XMPP_GUEST_DOMAIN
171182
- XMPP_MUC_DOMAIN
172-
- XMPP_RECORDER_DOMAIN
183+
- XMPP_HIDDEN_DOMAIN
173184
- XMPP_PORT
185+
- XMPP_RECORDER_DOMAIN
174186
- WHITEBOARD_COLLAB_SERVER_PUBLIC_URL
175187
- WHITEBOARD_COLLAB_SERVER_URL_BASE
176188
networks:
@@ -180,13 +192,15 @@ services:
180192

181193
# XMPP server
182194
prosody:
183-
image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9646}
195+
image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9955}
184196
restart: ${RESTART_POLICY:-unless-stopped}
185197
expose:
186198
- '${XMPP_PORT:-5222}'
187199
- '${PROSODY_S2S_PORT:-5269}'
188200
- '5347'
189201
- '${PROSODY_HTTP_PORT:-5280}'
202+
labels:
203+
service: "jitsi-prosody"
190204
volumes:
191205
- ${CONFIG}/prosody/config:/config:Z
192206
- ${CONFIG}/prosody/prosody-plugins-custom:/prosody-plugins-custom:Z
@@ -202,6 +216,7 @@ services:
202216
- ENABLE_LOBBY
203217
- ENABLE_RECORDING
204218
- ENABLE_S2S
219+
- ENABLE_TRANSCRIPTIONS
205220
- ENABLE_VISITORS
206221
- ENABLE_XMPP_WEBSOCKET
207222
- ENABLE_JAAS_COMPONENTS
@@ -220,6 +235,8 @@ services:
220235
- JIBRI_XMPP_PASSWORD
221236
- JICOFO_AUTH_PASSWORD
222237
- JICOFO_COMPONENT_SECRET
238+
- JIGASI_TRANSCRIBER_PASSWORD
239+
- JIGASI_TRANSCRIBER_USER
223240
- JIGASI_XMPP_USER
224241
- JIGASI_XMPP_PASSWORD
225242
- JVB_AUTH_USER
@@ -260,7 +277,10 @@ services:
260277
- PROSODY_C2S_REQUIRE_ENCRYPTION
261278
- PROSODY_RESERVATION_ENABLED
262279
- PROSODY_RESERVATION_REST_BASE_URL
280+
- PROSODY_DISABLE_C2S_LIMIT
281+
- PROSODY_DISABLE_S2S_LIMIT
263282
- PROSODY_ENABLE_RATE_LIMITS
283+
- PROSODY_ENABLE_RECORDING_METADATA
264284
- PROSODY_ENABLE_STANZA_COUNTS
265285
- PROSODY_ENABLE_S2S
266286
- PROSODY_ENABLE_METRICS
@@ -279,15 +299,19 @@ services:
279299
- PROSODY_TRUSTED_PROXIES
280300
- PROSODY_VISITOR_INDEX
281301
- PROSODY_VISITORS_MUC_PREFIX
302+
- PROSODY_VISITORS_S2S_VHOSTS
282303
- PUBLIC_URL
283304
- STUN_HOST
284305
- STUN_PORT
285306
- TURN_CREDENTIALS
307+
- TURN_USERNAME
308+
- TURN_PASSWORD
286309
- TURN_HOST
287310
- TURNS_HOST
288311
- TURN_PORT
289312
- TURNS_PORT
290313
- TURN_TRANSPORT
314+
- TURN_TTL
291315
- TZ
292316
- VISITORS_MAX_VISITORS_PER_NODE
293317
- VISITORS_XMPP_DOMAIN
@@ -305,8 +329,9 @@ services:
305329
- XMPP_MUC_MODULES
306330
- XMPP_MUC_CONFIGURATION
307331
- XMPP_INTERNAL_MUC_MODULES
308-
- XMPP_RECORDER_DOMAIN
332+
- XMPP_HIDDEN_DOMAIN
309333
- XMPP_PORT
334+
- XMPP_RECORDER_DOMAIN
310335
- XMPP_SERVER_S2S_PORT
311336
- XMPP_SPEAKERSTATS_MODULES
312337
networks:
@@ -316,18 +341,21 @@ services:
316341

317342
# Focus component
318343
jicofo:
319-
image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9646}
344+
image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9955}
320345
restart: ${RESTART_POLICY:-unless-stopped}
321346
ports:
322347
- '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
323348
volumes:
324349
- ${CONFIG}/jicofo:/config:Z
350+
labels:
351+
service: "jitsi-jicofo"
325352
environment:
326353
- AUTH_TYPE
327354
- BRIDGE_AVG_PARTICIPANT_STRESS
328355
- BRIDGE_STRESS_THRESHOLD
329356
- ENABLE_AUTH
330357
- ENABLE_AUTO_OWNER
358+
- ENABLE_MODERATOR_CHECKS
331359
- ENABLE_CODEC_VP8
332360
- ENABLE_CODEC_VP9
333361
- ENABLE_CODEC_AV1
@@ -338,6 +366,7 @@ services:
338366
- ENABLE_OCTO_SCTP
339367
- ENABLE_RECORDING
340368
- ENABLE_SCTP
369+
- ENABLE_TRANSCRIPTIONS
341370
- ENABLE_VISITORS
342371
- ENABLE_AUTO_LOGIN
343372
- JICOFO_AUTH_LIFETIME
@@ -387,10 +416,11 @@ services:
387416
- XMPP_AUTH_DOMAIN
388417
- XMPP_INTERNAL_MUC_DOMAIN
389418
- XMPP_MUC_DOMAIN
390-
- XMPP_RECORDER_DOMAIN
419+
- XMPP_HIDDEN_DOMAIN
391420
- XMPP_REPLY_TIMEOUT
392421
- XMPP_SERVER
393422
- XMPP_PORT
423+
- XMPP_RECORDER_DOMAIN
394424
- MAX_SSRCS_PER_USER
395425
- MAX_SSRC_GROUPS_PER_USER
396426
depends_on:
@@ -400,13 +430,15 @@ services:
400430

401431
# Video bridge
402432
jvb:
403-
image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9646}
433+
image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9955}
404434
restart: ${RESTART_POLICY:-unless-stopped}
405435
ports:
406436
- '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
407437
- '127.0.0.1:${JVB_COLIBRI_PORT:-8080}:8080'
408438
volumes:
409439
- ${CONFIG}/jvb:/config:Z
440+
labels:
441+
service: "jitsi-jvb"
410442
environment:
411443
- AUTOSCALER_SIDECAR_KEY_FILE
412444
- AUTOSCALER_SIDECAR_KEY_ID

0 commit comments

Comments
 (0)