From 17c2c4278a435a0f70b9ff5fdb2c077f4c7f8770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= <samip5@users.noreply.github.com>
Date: Sat, 6 Apr 2024 04:45:31 +0300
Subject: [PATCH] Support for more backend config options.

---
 charts/apps/piped/Chart.yaml                       |  6 +++---
 charts/apps/piped/README.md                        |  2 +-
 charts/apps/piped/templates/backend/configmap.yaml | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/charts/apps/piped/Chart.yaml b/charts/apps/piped/Chart.yaml
index d9f4630..c026aac 100644
--- a/charts/apps/piped/Chart.yaml
+++ b/charts/apps/piped/Chart.yaml
@@ -10,7 +10,7 @@ sources:
   - https://github.com/TeamPiped/piped-proxy
 keywords:
   - streaming
-version: 5.1.4
+version: 5.1.5
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 maintainers:
@@ -27,5 +27,5 @@ dependencies:
     condition: postgresql.enabled
 annotations:
   artifacthub.io/changes: |-
-    - kind: fixed
-      description: backend env var related templates
+    - kind: added
+      description: Support for more backend config options.
diff --git a/charts/apps/piped/README.md b/charts/apps/piped/README.md
index 3d2a6cf..cd4646d 100644
--- a/charts/apps/piped/README.md
+++ b/charts/apps/piped/README.md
@@ -1,6 +1,6 @@
 # piped
 
-![Version: 5.1.3](https://img.shields.io/badge/Version-5.1.3-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 5.1.5](https://img.shields.io/badge/Version-5.1.5-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 Piped is an alternative privacy-friendly YouTube frontend which is efficient by design.
 
diff --git a/charts/apps/piped/templates/backend/configmap.yaml b/charts/apps/piped/templates/backend/configmap.yaml
index 1a3c9f3..5da70d7 100644
--- a/charts/apps/piped/templates/backend/configmap.yaml
+++ b/charts/apps/piped/templates/backend/configmap.yaml
@@ -32,6 +32,12 @@ data:
     {{- else }}
      {{- fail "PROXY_PART needs to be set in config values or ytproxy ingress must be enabled."}}
     {{ end }}
+    {{- if .Values.backend.config.CAPTCHA_BASE_URL }}
+    CAPTCHA_BASE_URL: {{ .Values.backend.config.CAPTCHA_BASE_URL }}
+    {{- else if (and .Values.backend.config.CAPTCHA_BASE_URL .Values.backend.config.CAPTCHA_API_KEY )}}
+    CAPTCHA_BASE_URL: {{ .Values.backend.config.CAPTCHA_BASE_URL }}
+    CAPTCHA_API_KEY: {{ .Values.backend.config.CAPTCHA_API_KEY }}
+    {{- end}}
     {{- if .Values.backend.config.API_URL }}
     API_URL: {{ .Values.backend.config.API_URL }}
     {{- else if (and .Values.ingress.backend.enabled .Values.ingress.backend.tls) }}
@@ -72,7 +78,6 @@ data:
     {{- else if .Values.postgresql.enabled }}
     hibernate.connection.url: jdbc:postgresql://piped-postgresql/{{ .Values.postgresql.auth.database}}
     hibernate.connection.driver_class: org.postgresql.Driver
-    hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
     hibernate.connection.username: {{.Values.postgresql.auth.username }}
     hibernate.connection.password: {{.Values.postgresql.auth.password }}
     {{- else }}
@@ -83,3 +88,10 @@ data:
     {{- else }}
     SENTRY_DSN:
     {{- end }}
+    {{- if (and .Values.backend.config.MATRIX_SERVER .Values.backend.config.MATRIX_TOKEN) }}
+    MATRIX_SERVER: {{.Values.backend.config.MATRIX_SERVER }}
+    MATRIX_TOKEN: {{ .Values.backend.config.MATRIX_TOKEN }}
+    {{- else if (not .Values.backend.config.MATRIX_TOKEN) }}
+    MATRIX_SERVER: https://matrix-client.matrix.org
+    {{- end }}
+