Merge tag 'tags/stable-9955' into openshift

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

.github/workflows/ci.yml

@@ -7,6 +7,64 @@ on:
     - master
 
 jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+    - name: Check Node / npm versions
+      run: |
+        node -v
+        npm -v
+    - name: setup tpl
+      run: |
+        dpkgArch="$(dpkg --print-architecture)"
+        case "${dpkgArch##*-}" in \
+          "amd64") TPL_ARCH=amd64; S6_ARCH=amd64 ;; \
+          "arm64") TPL_ARCH=arm64; S6_ARCH=aarch64 ;; \
+          *) echo "unsupported architecture"; exit 1 ;; \
+        esac
+        wget -qO /tmp/tpl https://github.com/jitsi/tpl/releases/download/v1.4.0/tpl-linux-${TPL_ARCH}
+        chmod +x /tmp/tpl
+    - name: Run tpl with default values for web
+      run:  |
+        /tmp/tpl web/rootfs/defaults/system-config.js > /tmp/config.js
+        /tmp/tpl web/rootfs/defaults/settings-config.js >> /tmp/config.js
+    - name: Check config.js syntax
+      run: node /tmp/config.js
+    - name: Run tpl with default values for jvb
+      run:  |
+        /tmp/tpl jvb/rootfs/defaults/jvb.conf > /tmp/jvb.conf
+        /tmp/tpl jvb/rootfs/defaults/logging.properties > /tmp/logging.properties
+        /tmp/tpl jvb/rootfs/defaults/autoscaler-sidecar.config > /tmp/autoscaler-sidecar.config
+    - name: Run tpl with default values for jicofo
+      run:  |
+        /tmp/tpl jicofo/rootfs/defaults/jicofo.conf > /tmp/jicofo.conf
+        /tmp/tpl jicofo/rootfs/defaults/logging.properties > /tmp/logging.properties
+    - name: Run tpl with default values for jibri
+      run:  |
+        /tmp/tpl jibri/rootfs/defaults/jibri.conf > /tmp/jibri.conf
+        /tmp/tpl jibri/rootfs/defaults/logging.properties > /tmp/logging.properties
+        /tmp/tpl jibri/rootfs/defaults/xmpp.conf > /tmp/xmpp.conf
+        /tmp/tpl jibri/rootfs/defaults/xorg-video-dummy.conf > /tmp/xorg-video-dummy.conf
+        /tmp/tpl jibri/rootfs/defaults/autoscaler-sidecar.config > /tmp/autoscaler-sidecar.config
+    - name: Run tpl with default values for jigasi
+      run:  |
+        /tmp/tpl jigasi/rootfs/defaults/sip-communicator.properties > /tmp/sip-communicator.properties
+        /tmp/tpl jigasi/rootfs/defaults/sipserver-sip-communicator.properties > /tmp/xmpp-sip-communicator.properties
+        /tmp/tpl jigasi/rootfs/defaults/transcriber-sip-communicator.properties > /tmp/xmpp-sip-communicator.properties
+        /tmp/tpl jigasi/rootfs/defaults/xmpp-sip-communicator.properties > /tmp/xmpp-sip-communicator.properties
+        /tmp/tpl jigasi/rootfs/defaults/logging.properties > /tmp/logging.properties
+        /tmp/tpl jigasi/rootfs/defaults/autoscaler-sidecar.config > /tmp/autoscaler-sidecar.config
+    - name: Run tpl with default values for prosody
+      run:  |
+        /tmp/tpl prosody/rootfs/defaults/prosody.cfg.lua > /tmp/prosody.cfg.lua
+        /tmp/tpl prosody/rootfs/defaults/saslauthd.conf > /tmp/saslauthd.conf
+        /tmp/tpl prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua > /tmp/jitsi-meet.cfg.lua
+        /tmp/tpl prosody/rootfs/defaults/conf.d/brewery.cfg.lua > /tmp/brewery.cfg.lua
+        /tmp/tpl prosody/rootfs/defaults/conf.d/visitors.cfg.lua > /tmp/visitors.cfg.lua
+        /tmp/tpl prosody/rootfs/defaults/rules.d/jvb_muc_presence_filter.pfw > /tmp/jvb_muc_presence_filter.pfw
   build:
     runs-on: ubuntu-latest
     steps:

CHANGELOG.md

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

base/Dockerfile

@@ -13,8 +13,8 @@ RUN \
         *) echo "unsupported architecture"; exit 1 ;; \
     esac && \
     apt-dpkg-wrap apt-get update && \
-    apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget && \
-    wget -qO /usr/bin/tpl https://github.com/jitsi/tpl/releases/download/v1.3.0/tpl-linux-${TPL_ARCH} && \
+    apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget curl && \
+    wget -qO /usr/bin/tpl https://github.com/jitsi/tpl/releases/download/v1.4.0/tpl-linux-${TPL_ARCH} && \
     wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | gpg --dearmour > /etc/apt/trusted.gpg.d/jitsi.gpg && \
     echo "deb https://download.jitsi.org $JITSI_RELEASE/" > /etc/apt/sources.list.d/jitsi.list && \
     echo "deb http://ftp.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list && \

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9646}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9955}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -12,6 +12,9 @@ services:
             - ${CONFIG}/web:/config:Z
             - ${CONFIG}/web/crontabs:/var/spool/cron/crontabs:Z
             - ${CONFIG}/transcripts:/usr/share/jitsi-meet/transcripts:Z
+            - ${CONFIG}/web/load-test:/usr/share/jitsi-meet/load-test:Z
+        labels:
+            service: "jitsi-web"
         environment:
             - AMPLITUDE_ID
             - ANALYTICS_SCRIPT_URLS
@@ -21,6 +24,10 @@ services:
             - BRANDING_DATA_URL
             - BOSH_RELATIVE
             - CHROME_EXTENSION_BANNER_JSON
+            - CODEC_ORDER_JVB
+            - CODEC_ORDER_JVB_MOBILE
+            - CODEC_ORDER_P2P
+            - CODEC_ORDER_P2P_MOBILE
             - COLIBRI_WEBSOCKET_PORT
             - COLIBRI_WEBSOCKET_JVB_LOOKUP_NAME
             - COLIBRI_WEBSOCKET_REGEX
@@ -54,7 +61,9 @@ services:
             - DROPBOX_APPKEY
             - DROPBOX_REDIRECT_URI
             - DYNAMIC_BRANDING_URL
+            - ENABLE_ADAPTIVE_MODE
             - ENABLE_AUDIO_PROCESSING
+            - ENABLE_AUTOMATIC_GAIN_CONTROL
             - ENABLE_AUTH
             - ENABLE_AUTH_DOMAIN
             - ENABLE_BREAKOUT_ROOMS
@@ -95,6 +104,7 @@ services:
             - ENABLE_TALK_WHILE_MUTED
             - ENABLE_TCC
             - ENABLE_TRANSCRIPTIONS
+            - ENABLE_VLA
             - ENABLE_XMPP_WEBSOCKET
             - ENABLE_JAAS_COMPONENTS
             - ETHERPAD_PUBLIC_URL
@@ -115,13 +125,15 @@ services:
             - MATOMO_ENDPOINT
             - MATOMO_SITE_ID
             - MICROSOFT_API_APP_CLIENT_ID
+            - NGINX_KEEPALIVE_TIMEOUT
             - NGINX_RESOLVER
             - NGINX_WORKER_PROCESSES
             - NGINX_WORKER_CONNECTIONS
             - PEOPLE_SEARCH_URL
             - PREFERRED_LANGUAGE
             - PUBLIC_URL
             - P2P_PREFERRED_CODEC
+            - P2P_STUN_SERVERS
             - RESOLUTION
             - RESOLUTION_MIN
             - RESOLUTION_WIDTH
@@ -132,7 +144,6 @@ services:
             - START_WITH_AUDIO_MUTED
             - START_VIDEO_MUTED
             - START_WITH_VIDEO_MUTED
-            - TESTING_AV1_SUPPORT
             - TOKEN_AUTH_URL
             - TOOLBAR_BUTTONS
             - TRANSLATION_LANGUAGES
@@ -169,8 +180,9 @@ services:
             - XMPP_DOMAIN
             - XMPP_GUEST_DOMAIN
             - XMPP_MUC_DOMAIN
-            - XMPP_RECORDER_DOMAIN
+            - XMPP_HIDDEN_DOMAIN
             - XMPP_PORT
+            - XMPP_RECORDER_DOMAIN
             - WHITEBOARD_COLLAB_SERVER_PUBLIC_URL
             - WHITEBOARD_COLLAB_SERVER_URL_BASE
         networks:
@@ -180,13 +192,15 @@ services:
 
                 # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9646}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9955}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
             - '${PROSODY_S2S_PORT:-5269}'
             - '5347'
             - '${PROSODY_HTTP_PORT:-5280}'
+        labels:
+            service: "jitsi-prosody"
         volumes:
             - ${CONFIG}/prosody/config:/config:Z
             - ${CONFIG}/prosody/prosody-plugins-custom:/prosody-plugins-custom:Z
@@ -202,6 +216,7 @@ services:
             - ENABLE_LOBBY
             - ENABLE_RECORDING
             - ENABLE_S2S
+            - ENABLE_TRANSCRIPTIONS
             - ENABLE_VISITORS
             - ENABLE_XMPP_WEBSOCKET
             - ENABLE_JAAS_COMPONENTS
@@ -220,6 +235,8 @@ services:
             - JIBRI_XMPP_PASSWORD
             - JICOFO_AUTH_PASSWORD
             - JICOFO_COMPONENT_SECRET
+            - JIGASI_TRANSCRIBER_PASSWORD
+            - JIGASI_TRANSCRIBER_USER
             - JIGASI_XMPP_USER
             - JIGASI_XMPP_PASSWORD
             - JVB_AUTH_USER
@@ -260,7 +277,10 @@ services:
             - PROSODY_C2S_REQUIRE_ENCRYPTION
             - PROSODY_RESERVATION_ENABLED
             - PROSODY_RESERVATION_REST_BASE_URL
+            - PROSODY_DISABLE_C2S_LIMIT
+            - PROSODY_DISABLE_S2S_LIMIT
             - PROSODY_ENABLE_RATE_LIMITS
+            - PROSODY_ENABLE_RECORDING_METADATA
             - PROSODY_ENABLE_STANZA_COUNTS
             - PROSODY_ENABLE_S2S
             - PROSODY_ENABLE_METRICS
@@ -279,15 +299,19 @@ services:
             - PROSODY_TRUSTED_PROXIES
             - PROSODY_VISITOR_INDEX
             - PROSODY_VISITORS_MUC_PREFIX
+            - PROSODY_VISITORS_S2S_VHOSTS
             - PUBLIC_URL
             - STUN_HOST
             - STUN_PORT
             - TURN_CREDENTIALS
+            - TURN_USERNAME
+            - TURN_PASSWORD
             - TURN_HOST
             - TURNS_HOST
             - TURN_PORT
             - TURNS_PORT
             - TURN_TRANSPORT
+            - TURN_TTL
             - TZ
             - VISITORS_MAX_VISITORS_PER_NODE
             - VISITORS_XMPP_DOMAIN
@@ -305,8 +329,9 @@ services:
             - XMPP_MUC_MODULES
             - XMPP_MUC_CONFIGURATION
             - XMPP_INTERNAL_MUC_MODULES
-            - XMPP_RECORDER_DOMAIN
+            - XMPP_HIDDEN_DOMAIN
             - XMPP_PORT
+            - XMPP_RECORDER_DOMAIN
             - XMPP_SERVER_S2S_PORT
             - XMPP_SPEAKERSTATS_MODULES
         networks:
@@ -316,18 +341,21 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9646}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9955}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
         volumes:
             - ${CONFIG}/jicofo:/config:Z
+        labels:
+            service: "jitsi-jicofo"
         environment:
             - AUTH_TYPE
             - BRIDGE_AVG_PARTICIPANT_STRESS
             - BRIDGE_STRESS_THRESHOLD
             - ENABLE_AUTH
             - ENABLE_AUTO_OWNER
+            - ENABLE_MODERATOR_CHECKS
             - ENABLE_CODEC_VP8
             - ENABLE_CODEC_VP9
             - ENABLE_CODEC_AV1
@@ -338,6 +366,7 @@ services:
             - ENABLE_OCTO_SCTP
             - ENABLE_RECORDING
             - ENABLE_SCTP
+            - ENABLE_TRANSCRIPTIONS
             - ENABLE_VISITORS
             - ENABLE_AUTO_LOGIN
             - JICOFO_AUTH_LIFETIME
@@ -387,10 +416,11 @@ services:
             - XMPP_AUTH_DOMAIN
             - XMPP_INTERNAL_MUC_DOMAIN
             - XMPP_MUC_DOMAIN
-            - XMPP_RECORDER_DOMAIN
             - XMPP_REPLY_TIMEOUT
+            - XMPP_HIDDEN_DOMAIN
             - XMPP_SERVER
             - XMPP_PORT
+            - XMPP_RECORDER_DOMAIN
             - MAX_SSRCS_PER_USER
             - MAX_SSRC_GROUPS_PER_USER
         depends_on:
@@ -400,13 +430,15 @@ services:
 
                 # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9646}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9955}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
             - '127.0.0.1:${JVB_COLIBRI_PORT:-8080}:8080'
         volumes:
             - ${CONFIG}/jvb:/config:Z
+        labels:
+            service: "jitsi-jvb"
         environment:
             - AUTOSCALER_SIDECAR_KEY_FILE
             - AUTOSCALER_SIDECAR_KEY_ID