From 98af734f12e5563520192b93ad2b1aeb7a79429c Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Wed, 14 Feb 2024 15:22:32 +0100
Subject: [PATCH] fix(mycloud-*): switch to b64enc default password for
 database

---
 mycloud-authentik/templates/release.yaml           | 2 +-
 mycloud-gotosocial/templates/release.yaml          | 2 +-
 mycloud-matrix/templates/server/synapse.yaml       | 2 +-
 mycloud-nextcloud/templates/release.yaml           | 2 +-
 mycloud-services/templates/postgresql/secrets.yaml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mycloud-authentik/templates/release.yaml b/mycloud-authentik/templates/release.yaml
index b275c68..0fb387f 100644
--- a/mycloud-authentik/templates/release.yaml
+++ b/mycloud-authentik/templates/release.yaml
@@ -27,7 +27,7 @@ spec:
         host: {{ .Values.database.host | quote }}
         name: {{ .Values.database.name | quote }}
         user: {{ .Values.database.username | quote }}
-        password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "authentik" "database_password") | quote }}
+        password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "authentik" "database_password" | b64enc) | quote }}
       email:
         host: {{ .Values.commons.mail.host | quote }}
         username: {{ .Values.commons.mail.username | quote }}
diff --git a/mycloud-gotosocial/templates/release.yaml b/mycloud-gotosocial/templates/release.yaml
index dcf9e33..2f9a957 100644
--- a/mycloud-gotosocial/templates/release.yaml
+++ b/mycloud-gotosocial/templates/release.yaml
@@ -31,7 +31,7 @@ spec:
         type: postgres
         address: {{ .Values.database.host | quote }}
         username: {{ .Values.database.username | quote }}
-        password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "gotosocial" "database_password") | quote }}
+        password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "gotosocial" "database_password" | b64enc) | quote }}
         database: {{ .Values.database.name | quote }}
       accounts:
         registrationOpen: false
diff --git a/mycloud-matrix/templates/server/synapse.yaml b/mycloud-matrix/templates/server/synapse.yaml
index f7a15e1..2c1afed 100644
--- a/mycloud-matrix/templates/server/synapse.yaml
+++ b/mycloud-matrix/templates/server/synapse.yaml
@@ -164,7 +164,7 @@ spec:
     externalPostgresql:
       host: {{ .Values.databases.server.host | quote }}
       username: {{ .Values.databases.server.username | quote }}
-      password: {{ .Values.databases.server.password | default (derivePassword 1 "long" .Values.commons.masterPassword "matrix-synapse" "database_password") | quote }}
+      password: {{ .Values.databases.server.password | default (derivePassword 1 "long" .Values.commons.masterPassword "matrix-synapse" "database_password" | b64enc) | quote }}
       database: {{ .Values.databases.server.name | quote }}
 
     prometheus:
diff --git a/mycloud-nextcloud/templates/release.yaml b/mycloud-nextcloud/templates/release.yaml
index de88414..0b0154c 100644
--- a/mycloud-nextcloud/templates/release.yaml
+++ b/mycloud-nextcloud/templates/release.yaml
@@ -246,4 +246,4 @@ spec:
       host: {{ .Values.database.host | quote }}
       database: {{ .Values.database.name | quote }}
       user: {{ .Values.database.username | quote }}
-      password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "nextcloud" "database_password") | quote }}
+      password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "nextcloud" "database_password" | b64enc) | quote }}
diff --git a/mycloud-services/templates/postgresql/secrets.yaml b/mycloud-services/templates/postgresql/secrets.yaml
index d32329c..c6678d2 100644
--- a/mycloud-services/templates/postgresql/secrets.yaml
+++ b/mycloud-services/templates/postgresql/secrets.yaml
@@ -9,6 +9,6 @@ stringData:
       users:
         {{- range $database, $config := .Values.databases }}
         {{- if (eq $config.type "postgresql") }}
-        {{ $config.username | default $database }}: {{ $config.password | default (derivePassword 1 "long" $.Values.commons.masterPassword $database "database_password") | quote }}
+        {{ $config.username | default $database }}: {{ $config.password | default (derivePassword 1 "long" $.Values.commons.masterPassword $database "database_password" | b64enc) | quote }}
         {{- end }}
         {{- end }}