From 7bb75459721340d247529aaae0ff4749ed592576 Mon Sep 17 00:00:00 2001 From: Simon L Date: Tue, 27 Jun 2023 10:59:20 +0200 Subject: [PATCH 1/3] talk-recording - set allow_all and skip_verify via env Signed-off-by: Simon L --- Containers/talk-recording/Dockerfile | 2 ++ Containers/talk-recording/start.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Containers/talk-recording/Dockerfile b/Containers/talk-recording/Dockerfile index a9aae7bb..89a5656a 100644 --- a/Containers/talk-recording/Dockerfile +++ b/Containers/talk-recording/Dockerfile @@ -3,6 +3,8 @@ FROM python:3.11.4-alpine3.18 COPY --chmod=775 start.sh /start.sh ENV RECORDING_VERSION v17.0.2 +ENV ALLOW_ALL false +ENV SKIP_VERIFY false RUN set -ex; \ apk add --no-cache \ diff --git a/Containers/talk-recording/start.sh b/Containers/talk-recording/start.sh index 9f0fc7f1..cd2325a1 100644 --- a/Containers/talk-recording/start.sh +++ b/Containers/talk-recording/start.sh @@ -21,11 +21,11 @@ level = 30 listen = 0.0.0.0:1234 [backend] -allowall = false +allowall = ${ALLOW_ALL} # TODO: remove secret below when https://github.com/nextcloud/spreed/issues/9580 is fixed secret = ${RECORDING_SECRET} backends = backend-1 -skipverify = false +skipverify = ${SKIP_VERIFY} maxmessagesize = 1024 videowidth = 1920 videoheight = 1080 @@ -34,7 +34,7 @@ directory = /tmp [backend-1] url = https://${NC_DOMAIN} secret = ${RECORDING_SECRET} -skipverify = false +skipverify = ${SKIP_VERIFY} [signaling] signalings = signaling-1 From 0c5cb7de255e26cb1f43bddc0b7e400d7bc9725a Mon Sep 17 00:00:00 2001 From: Simon L Date: Tue, 27 Jun 2023 13:13:15 +0200 Subject: [PATCH 2/3] also allow to adjust the protocol Signed-off-by: Simon L --- Containers/talk-recording/Dockerfile | 1 + Containers/talk-recording/start.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Containers/talk-recording/Dockerfile b/Containers/talk-recording/Dockerfile index 89a5656a..de5bca56 100644 --- a/Containers/talk-recording/Dockerfile +++ b/Containers/talk-recording/Dockerfile @@ -4,6 +4,7 @@ COPY --chmod=775 start.sh /start.sh ENV RECORDING_VERSION v17.0.2 ENV ALLOW_ALL false +ENV HPB_PROTOCOL https ENV SKIP_VERIFY false RUN set -ex; \ diff --git a/Containers/talk-recording/start.sh b/Containers/talk-recording/start.sh index cd2325a1..cbc45c60 100644 --- a/Containers/talk-recording/start.sh +++ b/Containers/talk-recording/start.sh @@ -32,7 +32,7 @@ videoheight = 1080 directory = /tmp [backend-1] -url = https://${NC_DOMAIN} +url = ${HPB_PROTOCOL}://${NC_DOMAIN} secret = ${RECORDING_SECRET} skipverify = ${SKIP_VERIFY} @@ -40,7 +40,7 @@ skipverify = ${SKIP_VERIFY} signalings = signaling-1 [signaling-1] -url = https://${NC_DOMAIN}/standalone-signaling/ +url = ${HPB_PROTOCOL}://${NC_DOMAIN}/standalone-signaling/ internalsecret = ${INTERNAL_SECRET} [ffmpeg] From a262d1f210f25304f57e893ba749fb761bcc088f Mon Sep 17 00:00:00 2001 From: Simon L Date: Tue, 18 Jul 2023 10:01:24 +0200 Subject: [PATCH 3/3] add HPB_PATH Signed-off-by: Simon L --- Containers/talk-recording/Dockerfile | 1 + Containers/talk-recording/start.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Containers/talk-recording/Dockerfile b/Containers/talk-recording/Dockerfile index de5bca56..65d32a16 100644 --- a/Containers/talk-recording/Dockerfile +++ b/Containers/talk-recording/Dockerfile @@ -6,6 +6,7 @@ ENV RECORDING_VERSION v17.0.2 ENV ALLOW_ALL false ENV HPB_PROTOCOL https ENV SKIP_VERIFY false +ENV HPB_PATH /standalone-signaling/ RUN set -ex; \ apk add --no-cache \ diff --git a/Containers/talk-recording/start.sh b/Containers/talk-recording/start.sh index cbc45c60..dcdffcbf 100644 --- a/Containers/talk-recording/start.sh +++ b/Containers/talk-recording/start.sh @@ -40,7 +40,7 @@ skipverify = ${SKIP_VERIFY} signalings = signaling-1 [signaling-1] -url = ${HPB_PROTOCOL}://${NC_DOMAIN}/standalone-signaling/ +url = ${HPB_PROTOCOL}://${NC_DOMAIN}${HPB_PATH} internalsecret = ${INTERNAL_SECRET} [ffmpeg]