From 9f5c468d1331d49736b845ae234e545d2488e4bc Mon Sep 17 00:00:00 2001
From: Philip Haupt <“der.mad.mob@gmail.com”>
Date: Tue, 20 May 2025 22:31:07 +0200
Subject: [PATCH] fix: nextcloud

---
 nextcloud/main.yaml       | 23 ++++-------------------
 nextcloud/src/values.yaml |  8 ++++----
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/nextcloud/main.yaml b/nextcloud/main.yaml
index e43df3e..99b5f02 100644
--- a/nextcloud/main.yaml
+++ b/nextcloud/main.yaml
@@ -28,21 +28,6 @@ metadata:
   name: nextcloud-collabora
 ---
 apiVersion: v1
-data:
-  nextcloud-password: Y2hhbmdlbWU=
-  nextcloud-username: YWRtaW4=
-kind: Secret
-metadata:
-  labels:
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: nextcloud
-    app.kubernetes.io/version: 30.0.6
-    helm.sh/chart: nextcloud-6.6.9
-  name: nextcloud
-type: Opaque
----
-apiVersion: v1
 kind: Service
 metadata:
   labels:
@@ -517,11 +502,11 @@ spec:
         - name: PGDATA
           value: /bitnami/postgresql/data
         - name: POSTGRES_USER
-          value: nextcloud
+          value: oc_philiph
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
-              key: db-user
+              key: db-pass
               name: nextcloud
         - name: POSTGRES_POSTGRES_PASSWORD
           valueFrom:
@@ -553,7 +538,7 @@ spec:
             command:
             - /bin/sh
             - -c
-            - exec pg_isready -U "nextcloud" -d "dbname=nextcloud" -h 127.0.0.1 -p
+            - exec pg_isready -U "oc_philiph" -d "dbname=nextcloud" -h 127.0.0.1 -p
               5432
           failureThreshold: 6
           initialDelaySeconds: 30
@@ -571,7 +556,7 @@ spec:
             - -c
             - -e
             - |
-              exec pg_isready -U "nextcloud" -d "dbname=nextcloud" -h 127.0.0.1 -p 5432
+              exec pg_isready -U "oc_philiph" -d "dbname=nextcloud" -h 127.0.0.1 -p 5432
               [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
           failureThreshold: 6
           initialDelaySeconds: 5
diff --git a/nextcloud/src/values.yaml b/nextcloud/src/values.yaml
index 57e9ef5..e37edf1 100644
--- a/nextcloud/src/values.yaml
+++ b/nextcloud/src/values.yaml
@@ -453,8 +453,8 @@ postgresql:
     postgresql:
       # global.postgresql.auth overrides postgresql.auth
       auth:
-        username: nextcloud
-        password: changeme
+        username: oc_philiph
+        password: ""
         database: nextcloud
         # Name of existing secret to use for PostgreSQL credentials.
         # auth.postgresPassword, auth.password, and auth.replicationPassword will be ignored and picked up from this secret.
@@ -464,8 +464,8 @@ postgresql:
         # Names of keys in existing secret to use for PostgreSQL credentials
         secretKeys:
           adminPasswordKey: postgres-password
-          userPasswordKey: db-user
-          replicationPasswordKey: db-pass
+          userPasswordKey: db-pass
+          replicationPasswordKey: postgres-repl-pass
   primary:
     persistence:
       enabled: true