From f9f31b97a720612d0a33765781eff695d42aaf18 Mon Sep 17 00:00:00 2001
From: nold <nold@gnu.one>
Date: Tue, 16 Jan 2024 14:21:09 +0100
Subject: [PATCH] fix(nextcloud|forgejo): db backup

---
 projects/gitea/manifests/postgre.yaml     | 15 ++++----
 projects/nextcloud/manifests/postgre.yaml | 42 +++++++++++------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/projects/gitea/manifests/postgre.yaml b/projects/gitea/manifests/postgre.yaml
index d5aea61e..bccedf35 100644
--- a/projects/gitea/manifests/postgre.yaml
+++ b/projects/gitea/manifests/postgre.yaml
@@ -3,19 +3,20 @@ kind: Cluster
 metadata:
   name: gitea-db
   namespace: gitea
+  annotations:
+    cnpg.io/skipEmptyWalArchiveCheck: enabled
 spec:
   instances: 1
   imageName: ghcr.io/cloudnative-pg/postgresql:15
 
   bootstrap:
-    initdb:
-      database: app
-      owner: app
+    recovery:
+      source: gitea-db
 
   backup:
     barmanObjectStore:
-      destinationPath: "s3://gitea-db/"
-      endpointURL: "http://minio.minio.svc.cluster.local:9000"
+      destinationPath: "s3://forgejo/"
+      endpointURL: "http://s3-minio.s3.svc.cluster.local:9000"
       s3Credentials:
         accessKeyId:
           name: bucket
@@ -45,8 +46,8 @@ spec:
   externalClusters:
     - name: gitea-db
       barmanObjectStore:
-        destinationPath: "s3://gitea-db/"
-        endpointURL: "http://minio.minio.svc.cluster.local:9000"
+        destinationPath: "s3://forgejo/"
+        endpointURL: "http://s3-minio.s3.svc.cluster.local:9000"
         s3Credentials:
           accessKeyId:
             name: bucket
diff --git a/projects/nextcloud/manifests/postgre.yaml b/projects/nextcloud/manifests/postgre.yaml
index 78a49e3d..eb1aeb65 100644
--- a/projects/nextcloud/manifests/postgre.yaml
+++ b/projects/nextcloud/manifests/postgre.yaml
@@ -10,25 +10,25 @@ spec:
   bootstrap:
     recovery:
       source: nextcloud-db
-  #
-  # backup:
-  #   barmanObjectStore:
-  #     destinationPath: "s3://nextcloud-db/"
-  #     endpointURL: "http://minio.minio.svc.cluster.local:9000"
-  #     s3Credentials:
-  #       accessKeyId:
-  #         name: bucket
-  #         key: accesskey
-  #       secretAccessKey:
-  #         name: bucket
-  #         key: secretkey
-  #     wal:
-  #       compression: gzip
-  #       #encryption: AES256
-  #     data:
-  #       compression: gzip
-  #       #encryption: AES256
-  #   retentionPolicy: "90d"
+
+  backup:
+    barmanObjectStore:
+      destinationPath: "s3://nextcloud-backup/"
+      endpointURL: "http://s3-minio.s3.svc.cluster.local:9000"
+      s3Credentials:
+        accessKeyId:
+          name: bucket
+          key: accesskey
+        secretAccessKey:
+          name: bucket
+          key: secretkey
+      wal:
+        compression: gzip
+        #encryption: AES256
+      data:
+        compression: gzip
+        #encryption: AES256
+    retentionPolicy: "90d"
 
   resources:
     requests:
@@ -44,8 +44,8 @@ spec:
   externalClusters:
     - name: nextcloud-db
       barmanObjectStore:
-        destinationPath: "s3://nextcloud-db/"
-        endpointURL: "http://minio.minio.svc.cluster.local:9000"
+        destinationPath: "s3://nextcloud-backup/"
+        endpointURL: "http://s3-minio.s3.svc.cluster.local:9000"
         s3Credentials:
           accessKeyId:
             name: bucket