Merge tag 'tags/stable-10133' into openshift

guillaumevillemont · guillaumevillemont · commit ddc76db41fdc · 2025-03-21T14:58:24.000+01:00
diff --git a/.github/stale.yml b/.github/stale.yml
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,21 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v8
+        with:
+          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          stale-issue-label: 'stale'
+          stale-pr-label: 'stale'
+          exempt-issue-labels: 'confirmed'
+          exempt-pr-labels: 'confirmed'
+          days-before-issue-stale: 60
+          days-before-pr-stale: 90
+          days-before-issue-close: 10
+          days-before-pr-close: 10
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-10078-1}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-10133}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -121,6 +121,7 @@ services:
             - LETSENCRYPT_DOMAIN
             - LETSENCRYPT_EMAIL
             - LETSENCRYPT_USE_STAGING
+            - LETSENCRYPT_ACME_SERVER
             - MATOMO_ENDPOINT
             - MATOMO_SITE_ID
             - MICROSOFT_API_APP_CLIENT_ID
@@ -191,7 +192,7 @@ services:
 
                 # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-10078-1}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-10133}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -340,7 +341,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-10078-1}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-10133}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -431,7 +432,7 @@ services:
 
                 # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-10078-1}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-10133}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
diff --git a/env.example b/env.example
@@ -69,6 +69,8 @@ TZ=UTC
 # Use the staging server (for avoiding rate limits while testing)
 #LETSENCRYPT_USE_STAGING=1
 
+# Set ACME server. Default is zerossl, you can peek one at https://github.com/acmesh-official/acme.sh/wiki/Server
+#LETSENCRYPT_ACME_SERVER="letsencrypt"
 
 #
 # Etherpad integration (for document sharing)
diff --git a/jibri.yml b/jibri.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-10078-1}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-10133}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10078-1}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10133}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'
diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -51,6 +51,9 @@ limits = {
     c2s = {
         rate = "512kb/s";
     };
+    s2sin = {
+        rate = "512kb/s";
+    };
 }
 
 authentication = 'internal_hashed'
diff --git a/prosody/rootfs/defaults/prosody.cfg.lua b/prosody/rootfs/defaults/prosody.cfg.lua
@@ -72,6 +72,9 @@
 -- (see http://prosody.im/doc/creating_accounts for info)
 -- Example: admins = { "user1@example.com", "user2@example.net" }
 admins = { {{ if .Env.PROSODY_ADMINS }}{{ range $index, $element := $PROSODY_ADMIN_LIST -}}{{ if $index }}, {{ end }}"{{ $element }}"{{ end }}{{ end }} }
+
+component_admins_as_room_owners = true
+
 -- Enable use of libevent for better performance under high load
 -- For more information see: http://prosody.im/doc/libevent
 --use_libevent = true;
diff --git a/transcriber.yml b/transcriber.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     transcriber:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10078-1}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10133}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/transcriber:/config:Z
diff --git a/web/rootfs/usr/bin/init_jitsi_web b/web/rootfs/usr/bin/init_jitsi_web
@@ -14,10 +14,18 @@ if [[ $DISABLE_HTTPS -ne 1 ]]; then
         if [[ $LETSENCRYPT_USE_STAGING -eq 1 ]]; then
             STAGING="--staging"
         fi
+
+        ACME_SERVER=""
+        if [[ ! -z $LETSENCRYPT_ACME_SERVER ]]; then
+            ACME_SERVER="--set-default-ca --server $LETSENCRYPT_ACME_SERVER"
+            echo "Using custom ACME server: $LETSENCRYPT_ACME_SERVER"
+        fi
+
         export LE_WORKING_DIR="/config/acme.sh"
         # TODO: move away from standalone mode to webroot mode.
         /config/acme.sh/acme.sh \
             $STAGING \
+            $ACME_SERVER \
             --issue \
             --standalone
         # TODO: replace s6 service logic with supervisord

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ TZ=UTC`
`69`	`69`	`# Use the staging server (for avoiding rate limits while testing)`
`70`	`70`	`#LETSENCRYPT_USE_STAGING=1`
`71`	`71`
	`72`	`+# Set ACME server. Default is zerossl, you can peek one at https://github.com/acmesh-official/acme.sh/wiki/Server`
	`73`	`+#LETSENCRYPT_ACME_SERVER="letsencrypt"`
`72`	`74`
`73`	`75`	`#`
`74`	`76`	`# Etherpad integration (for document sharing)`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ limits = {`
`51`	`51`	`c2s = {`
`52`	`52`	`rate = "512kb/s";`
`53`	`53`	`};`
	`54`	`+ s2sin = {`
	`55`	`+ rate = "512kb/s";`
	`56`	`+ };`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`authentication = 'internal_hashed'`