Skip to content

Commit eb77cb0

Browse files
talk-update automated change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 04ffcb9 commit eb77cb0

File tree

4 files changed

+64
-10
lines changed

4 files changed

+64
-10
lines changed

Containers/talk-recording/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM python:3.13.3-alpine3.21
44
COPY --chmod=775 start.sh /start.sh
55
COPY --chmod=775 healthcheck.sh /healthcheck.sh
66

7-
ENV RECORDING_VERSION=v0.1
7+
ENV RECORDING_VERSION=v0.2.0
88
ENV ALLOW_ALL=false
99
ENV HPB_PROTOCOL=https
1010
ENV NC_PROTOCOL=https

Containers/talk-recording/recording.conf

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
2+
# SPDX-License-Identifier: AGPL-3.0-or-later
13
[logs]
24
# Log level based on numeric values of Python logging levels:
35
# - Critical: 50
@@ -12,6 +14,11 @@
1214
# IP and port to listen on for HTTP requests.
1315
#listen = 127.0.0.1:8000
1416

17+
[app]
18+
# Comma separated list of trusted proxies (IPs or CIDR networks) that may set
19+
# the "X-Forwarded-For" header.
20+
#trustedproxies =
21+
1522
[backend]
1623
# Allow any hostname as backend endpoint. This is extremely insecure and should
1724
# only be used during development.
@@ -100,6 +107,18 @@
100107
# ffmpeg. The options given here fully override the default global options.
101108
#common = ffmpeg -loglevel level+warning -n
102109

110+
# The (additional) options given to ffmpeg for the audio input. The options
111+
# given here extend the default options for the audio input, although they do
112+
# not override them.
113+
# Default options: '-f pulse -i {AUDIO_SOURCE}'
114+
#inputaudio =
115+
116+
# The (additional) options given to ffmpeg for the video input. The options
117+
# given here extend the default options for the video input, although they do
118+
# not override them.
119+
# Default options: '-f x11grab -draw_mouse 0 -video_size {WIDTH}x{HEIGHT} -i {VIDEO_SOURCE}'
120+
#inputvideo =
121+
103122
# The options given to ffmpeg to encode the audio output. The options given here
104123
# fully override the default options for the audio output.
105124
#outputaudio = -c:a libopus
@@ -120,4 +139,31 @@
120139
# will use Google Chrome, or Chromium if Google Chrome is not installed.
121140
# Allowed values: firefox, chrome
122141
# Defaults to firefox
123-
# browser = firefox
142+
#browser = firefox
143+
144+
# Path to the Selenium driver to use for recordings.
145+
# If set the driver must match the browser being used (for example,
146+
# "/usr/bin/geckodriver" for "firefox"). If no driver is explicitly set Selenium
147+
# Manager will try to find the right one in $PATH, downloading it as a fallback.
148+
# Note that Selenium Manager does not work in some architectures (for example,
149+
# Linux on arm64/aarch64), so in those architectures the driver must be
150+
# explicitly set.
151+
#driverPath =
152+
153+
# Path to the browser executable to use for recordings.
154+
# If set the executable must match the browser being used (for example,
155+
# "/usr/bin/firefox-esr" for "firefox"). If no executable is explicitly set
156+
# Selenium Manager will try to find the right one in $PATH. Depending on the
157+
# installed Selenium version if the executable is not found Selenium Manager may
158+
# also download the browser as a fallback.
159+
# Note that Selenium Manager does not work in some architectures (for example,
160+
# Linux on arm64/aarch64); in those architectures the Selenium driver will try
161+
# to find the executable, but the executable may need to be explicitly set if
162+
# not found by the driver.
163+
#browserPath =
164+
165+
[stats]
166+
# Comma-separated list of IP addresses (or CIDR networks) that are allowed to
167+
# access the stats endpoint.
168+
# Leave commented to only allow access from "127.0.0.1".
169+
#allowed_ips =

Containers/talk/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM eturnal/eturnal:1.12.1 AS eturnal
44
FROM strukturag/nextcloud-spreed-signaling:2.0.3 AS signaling
55
FROM alpine:3.21.3 AS janus
66

7-
ARG JANUS_VERSION=v1.3.1
7+
ARG JANUS_VERSION=v1.3.2
88
WORKDIR /src
99
RUN set -ex; \
1010
apk upgrade --no-cache -a; \

Containers/talk/server.conf.in

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ internalsecret = the-shared-secret-for-internal-clients
8484
# For backend type "etcd":
8585
# Key prefix of backend entries. All keys below will be watched and assumed to
8686
# contain a JSON document with the following entries:
87-
# - "url": Url of the Nextcloud instance.
87+
# - "urls": List of urls of the Nextcloud instance.
88+
# - "url": Url of the Nextcloud instance (deprecated).
8889
# - "secret": Shared secret for requests from and to the backend servers.
8990
#
9091
# Additional optional entries:
@@ -93,8 +94,8 @@ internalsecret = the-shared-secret-for-internal-clients
9394
# - "sessionlimit": Number of sessions that are allowed to connect.
9495
#
9596
# Example:
96-
# "/signaling/backend/one" -> {"url": "https://nextcloud.domain1.invalid", ...}
97-
# "/signaling/backend/two" -> {"url": "https://domain2.invalid/nextcloud", ...}
97+
# "/signaling/backend/one" -> {"urls": ["https://nextcloud.domain1.invalid"], ...}
98+
# "/signaling/backend/two" -> {"urls": ["https://domain2.invalid/nextcloud"], ...}
9899
#backendprefix = /signaling/backend
99100

100101
# Allow any hostname as backend endpoint. This is extremely insecure and should
@@ -122,8 +123,8 @@ connectionsperhost = 8
122123
# Backend configurations as defined in the "[backend]" section above. The
123124
# section names must match the ids used in "backends" above.
124125
#[backend-id]
125-
# URL of the Nextcloud instance
126-
#url = https://cloud.domain.invalid
126+
# Comma-separated list of urls of the Nextcloud instance
127+
#urls = https://cloud.domain.invalid
127128

128129
# Shared secret for requests from and to the backend servers. Leave empty to use
129130
# the common shared secret from above.
@@ -143,8 +144,8 @@ connectionsperhost = 8
143144
#maxscreenbitrate = 2097152
144145

145146
#[another-backend]
146-
# URL of the Nextcloud instance
147-
#url = https://cloud.otherdomain.invalid
147+
# Comma-separated list of urls of the Nextcloud instance
148+
#urls = https://cloud.otherdomain.invalid
148149

149150
# Shared secret for requests from and to the backend servers. Leave empty to use
150151
# the common shared secret from above.
@@ -179,6 +180,13 @@ connectionsperhost = 8
179180
# proxy server that is used.
180181
#maxscreenbitrate = 2097152
181182

183+
# List of IP addresses / subnets that are allowed to be used by clients in
184+
# candidates. The allowed list has preference over the blocked list below.
185+
#allowedcandidates = 10.0.0.0/8
186+
187+
# List of IP addresses / subnets to filter from candidates received by clients.
188+
#blockedcandidates = 1.2.3.0/24
189+
182190
# For type "proxy": timeout in seconds for requests to the proxy server.
183191
#proxytimeout = 2
184192

0 commit comments

Comments
 (0)