From 57384132206203aa45e81468d043c3b91d39d52a Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Mon, 12 Feb 2024 10:44:29 +0100
Subject: [PATCH] apps/do: properly set vikunja postgres password

---
 apps/do/do-test/vikunja-values-configmap.yaml  | 2 +-
 apps/do/vikunja-secrets/vikunja-variables.yaml | 5 +++--
 apps/do/vikunja/vikunja-values-configmap.yaml  | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/do/do-test/vikunja-values-configmap.yaml b/apps/do/do-test/vikunja-values-configmap.yaml
index 0ca9f16..530ecce 100644
--- a/apps/do/do-test/vikunja-values-configmap.yaml
+++ b/apps/do/do-test/vikunja-values-configmap.yaml
@@ -54,7 +54,7 @@ data:
                   redirecturl: "https://do-test.${domain}/auth/openid/"
                   providers:
                     - name: Stackspin
-                      authurl: "https://sso.${domain}/"
+                      authurl: "https://${hydra_domain}/"
                       clientid: "${client_id}"
                       clientsecret: "${client_secret}"
               service:
diff --git a/apps/do/vikunja-secrets/vikunja-variables.yaml b/apps/do/vikunja-secrets/vikunja-variables.yaml
index 6e55c96..085c0f2 100644
--- a/apps/do/vikunja-secrets/vikunja-variables.yaml
+++ b/apps/do/vikunja-secrets/vikunja-variables.yaml
@@ -5,5 +5,6 @@ metadata:
   namespace: flux-system
 spec:
   fields:
-    - fieldName: jwt
-    - fieldName: postgresql_password
+  - fieldName: jwt
+  - fieldName: postgresql_password
+  - fieldName: postgresql_admin_password
diff --git a/apps/do/vikunja/vikunja-values-configmap.yaml b/apps/do/vikunja/vikunja-values-configmap.yaml
index 5618691..340e5b1 100644
--- a/apps/do/vikunja/vikunja-values-configmap.yaml
+++ b/apps/do/vikunja/vikunja-values-configmap.yaml
@@ -106,6 +106,7 @@ data:
             database: vikunja
             username: vikunja
             password: "${postgresql_password}"
+            postgresPassword: "${postgresql_admin_password}"
       primary:
         persistence:
           existingClaim: vikunja-postgres