From ef768f4229e9b58944b06d50786afe92d7b76ca5 Mon Sep 17 00:00:00 2001
From: ziegler <ziegler@edu-sharing.net>
Date: Thu, 18 Jan 2024 08:52:18 +0100
Subject: [PATCH 1/2] fix: added missing video config vars for rendering
 service

---
 .../helm/service/src/main/chart/templates/configmap-env.yaml    | 2 ++
 .../services/rendering/helm/service/src/main/chart/values.yaml  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-env.yaml b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-env.yaml
index cddaa166..2a972a66 100644
--- a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-env.yaml
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/templates/configmap-env.yaml
@@ -47,3 +47,5 @@ data:
   SERVICES_RENDERING_VIDEO_FORMATS: {{ .Values.config.converter.video.formats | quote }}
   SERVICES_RENDERING_VIDEO_RESOLUTIONS: {{ .Values.config.converter.video.resolution.all | quote }}
   SERVICES_RENDERING_VIDEO_DEFAULT_RESOLUTION: {{ .Values.config.converter.video.resolution.default | quote }}
+  SERVICES_RENDERING_VIDEO_THREADS: {{ .Values.config.converter.video.threads | quote }}
+  SERVICES_RENDERING_VIDEO_TIMEOUT: {{ .Values.config.converter.video.timeout | quote }}
diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/values.yaml b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/values.yaml
index e186f662..68289a75 100644
--- a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/values.yaml
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/services/rendering/helm/service/src/main/chart/values.yaml
@@ -142,6 +142,8 @@ config:
       resolution:
         all: "240,720,1080"
         default: "720"
+      threads: 1
+      timeout: 3600
 
   database:
     driver: pgsql

From e79dfdd9ec5434cdf47ead6e36dbf8413c1106b7 Mon Sep 17 00:00:00 2001
From: Sebastian Wollner <wollner@edu-sharing.net>
Date: Fri, 26 Jan 2024 11:47:18 +0100
Subject: [PATCH 2/2] fix: repository db backup fails with unauthorized
 exception

---
 .../deploy/docker/compose/src/main/scripts/utils.sh           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/utils.sh b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/utils.sh
index a9c99741..a74ce6de 100755
--- a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/utils.sh
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/utils.sh
@@ -338,13 +338,13 @@ backup() {
     echo "backup postgres"
 
     if [[ -n $compressed ]] ; then
-      $COMPOSE_EXEC exec -t repository-database sh -c "export PGPASSWORD=${REPOSITORY_DATABASE_PASS:-repository}; pg_dump --format custom --no-owner --no-privileges ${REPOSITORY_DATABASE_NAME:-repository} | gzip" >"$backupDir/repository-db.gz" || {
+      $COMPOSE_EXEC exec -t repository-database sh -c "export PGPASSWORD=${REPOSITORY_DATABASE_PASS:-repository}; pg_dump --username ${REPOSITORY_DATABASE_USER:-repository} --format custom --no-owner --no-privileges ${REPOSITORY_DATABASE_NAME:-repository} | gzip" >"$backupDir/repository-db.gz" || {
         rm -rf "$backupDir"
         echo "ERROR on creating postgres dump"
         exit 1
       }
     else
-      $COMPOSE_EXEC exec -t repository-database sh -c "export PGPASSWORD=${REPOSITORY_DATABASE_PASS:-repository}; pg_dump --format custom --no-owner --no-privileges ${REPOSITORY_DATABASE_NAME:-repository}" > "$backupDir/repository-db.sql" || {
+      $COMPOSE_EXEC exec -t repository-database sh -c "export PGPASSWORD=${REPOSITORY_DATABASE_PASS:-repository}; pg_dump --username ${REPOSITORY_DATABASE_USER:-repository} --format custom --no-owner --no-privileges ${REPOSITORY_DATABASE_NAME:-repository}" > "$backupDir/repository-db.sql" || {
         rm -rf "$backupDir"
         echo "ERROR on creating postgres dump"
         exit 1