From c1e99cc1e5cc8bfaa22539678f9c25c9d9844cf5 Mon Sep 17 00:00:00 2001
From: GitHub Workflow <workflow@github.com>
Date: Wed, 22 May 2024 12:19:29 +0000
Subject: [PATCH] Repo-sync

---
 Containers/collabora/Dockerfile | 3 +--
 Containers/talk/Dockerfile      | 4 ++--
 Containers/talk/server.conf.in  | 9 +++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Containers/collabora/Dockerfile b/Containers/collabora/Dockerfile
index efd2b728..3eb2b187 100644
--- a/Containers/collabora/Dockerfile
+++ b/Containers/collabora/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
-FROM collabora/code:24.04.1.4.1
+FROM collabora/code:24.04.2.1.1
 
 USER root
 ARG DEBIAN_FRONTEND noninteractive
@@ -9,7 +9,6 @@ ARG DEBIAN_FRONTEND noninteractive
 RUN set -ex; \
     \
     apt-get update; \
-    apt-get upgrade -y; \
     apt-get install -y --no-install-recommends \
         tzdata \
         netcat-openbsd \
diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile
index 91e2b179..800aea53 100644
--- a/Containers/talk/Dockerfile
+++ b/Containers/talk/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:latest
-FROM nats:2.10.14-scratch as nats
+FROM nats:2.10.16-scratch as nats
 FROM eturnal/eturnal:1.12.0 AS eturnal
-FROM strukturag/nextcloud-spreed-signaling:1.2.4 as signaling
+FROM strukturag/nextcloud-spreed-signaling:1.3.0 as signaling
 FROM alpine:3.19.1 as janus
 
 ARG JANUS_VERSION=v0.14.2
diff --git a/Containers/talk/server.conf.in b/Containers/talk/server.conf.in
index 4df82b5e..6b61b7b8 100644
--- a/Containers/talk/server.conf.in
+++ b/Containers/talk/server.conf.in
@@ -7,7 +7,7 @@
 #readtimeout = 15
 
 # HTTP socket write timeout in seconds.
-#writetimeout = 15
+#writetimeout = 30
 
 [https]
 # IP and port to listen on for HTTPS requests.
@@ -18,7 +18,7 @@
 #readtimeout = 15
 
 # HTTPS socket write timeout in seconds.
-#writetimeout = 15
+#writetimeout = 30
 
 # Certificate / private key to use for the HTTPS server.
 certificate = /etc/nginx/ssl/server.crt
@@ -34,6 +34,11 @@ debug = false
 # room and call can be subscribed.
 #allowsubscribeany = false
 
+# Comma separated list of trusted proxies (IPs or CIDR networks) that may set
+# the "X-Real-Ip" or "X-Forwarded-For" headers.
+# Leave empty to allow loopback and local addresses.
+#trustedproxies =
+
 [sessions]
 # Secret value used to generate checksums of sessions. This should be a random
 # string of 32 or 64 bytes.