From 428c2b54355999dd11ba3ebb654e16dfee1e723a Mon Sep 17 00:00:00 2001
From: Brad Stein <Brad.Stein@gmail.com>
Date: Wed, 7 Jan 2026 03:39:59 -0300
Subject: [PATCH] nextcloud: restore app and user-data volumes

---
 services/nextcloud/cronjob.yaml             | 11 +++++---
 services/nextcloud/deployment.yaml          | 19 ++++++++++----
 services/nextcloud/maintenance-cronjob.yaml | 11 +++++---
 services/nextcloud/pvc.yaml                 | 28 +++++++++++++++++++++
 4 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/services/nextcloud/cronjob.yaml b/services/nextcloud/cronjob.yaml
index 86c55e1..7900bb1 100644
--- a/services/nextcloud/cronjob.yaml
+++ b/services/nextcloud/cronjob.yaml
@@ -24,9 +24,14 @@ spec:
               args:
                 - "cd /var/www/html && php -f cron.php"
               volumeMounts:
-                - name: nextcloud-data
+                - name: nextcloud-app
                   mountPath: /var/www/html
+                - name: nextcloud-user-data
+                  mountPath: /var/www/html/data
           volumes:
-            - name: nextcloud-data
+            - name: nextcloud-app
               persistentVolumeClaim:
-                claimName: nextcloud-data
+                claimName: nextcloud-app
+            - name: nextcloud-user-data
+              persistentVolumeClaim:
+                claimName: nextcloud-user-data
diff --git a/services/nextcloud/deployment.yaml b/services/nextcloud/deployment.yaml
index c28f23a..883d2f1 100644
--- a/services/nextcloud/deployment.yaml
+++ b/services/nextcloud/deployment.yaml
@@ -42,8 +42,10 @@ spec:
             runAsUser: 0
             runAsGroup: 0
           volumeMounts:
-            - name: nextcloud-data
+            - name: nextcloud-app
               mountPath: /var/www/html
+            - name: nextcloud-user-data
+              mountPath: /var/www/html/data
             - name: nextcloud-config
               mountPath: /var/www/html/config/extra.config.php
               subPath: extra.config.php
@@ -141,8 +143,10 @@ spec:
                   name: nextcloud-oidc
                   key: client-secret
           volumeMounts:
-            - name: nextcloud-data
+            - name: nextcloud-app
               mountPath: /var/www/html
+            - name: nextcloud-user-data
+              mountPath: /var/www/html/data
             - name: nextcloud-config
               mountPath: /var/www/html/config/extra.config.php
               subPath: extra.config.php
@@ -228,8 +232,10 @@ spec:
             - containerPort: 80
               name: http
           volumeMounts:
-            - name: nextcloud-data
+            - name: nextcloud-app
               mountPath: /var/www/html
+            - name: nextcloud-user-data
+              mountPath: /var/www/html/data
             - name: nextcloud-config
               mountPath: /var/www/html/config/extra.config.php
               subPath: extra.config.php
@@ -241,9 +247,12 @@ spec:
               cpu: 1
               memory: 3Gi
       volumes:
-        - name: nextcloud-data
+        - name: nextcloud-app
           persistentVolumeClaim:
-            claimName: nextcloud-data
+            claimName: nextcloud-app
+        - name: nextcloud-user-data
+          persistentVolumeClaim:
+            claimName: nextcloud-user-data
         - name: nextcloud-config
           configMap:
             name: nextcloud-config
diff --git a/services/nextcloud/maintenance-cronjob.yaml b/services/nextcloud/maintenance-cronjob.yaml
index 55fcbd1..c9421dd 100644
--- a/services/nextcloud/maintenance-cronjob.yaml
+++ b/services/nextcloud/maintenance-cronjob.yaml
@@ -34,8 +34,10 @@ spec:
                       name: nextcloud-admin
                       key: admin-password
               volumeMounts:
-                - name: nextcloud-data
+                - name: nextcloud-app
                   mountPath: /var/www/html
+                - name: nextcloud-user-data
+                  mountPath: /var/www/html/data
                 - name: maintenance-script
                   mountPath: /maintenance/maintenance.sh
                   subPath: maintenance.sh
@@ -47,9 +49,12 @@ spec:
                   cpu: 500m
                   memory: 512Mi
           volumes:
-            - name: nextcloud-data
+            - name: nextcloud-app
               persistentVolumeClaim:
-                claimName: nextcloud-data
+                claimName: nextcloud-app
+            - name: nextcloud-user-data
+              persistentVolumeClaim:
+                claimName: nextcloud-user-data
             - name: maintenance-script
               configMap:
                 name: nextcloud-maintenance-script
diff --git a/services/nextcloud/pvc.yaml b/services/nextcloud/pvc.yaml
index 3b855cc..1a660a5 100644
--- a/services/nextcloud/pvc.yaml
+++ b/services/nextcloud/pvc.yaml
@@ -1,6 +1,34 @@
 # services/nextcloud/pvc.yaml
 apiVersion: v1
 kind: PersistentVolumeClaim
+metadata:
+  name: nextcloud-app
+  namespace: nextcloud
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 20Gi
+  storageClassName: astreae
+  volumeName: pvc-9cf910d9-ae30-48e6-8d90-a6cbbf3cd2cf
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: nextcloud-user-data
+  namespace: nextcloud
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Ti
+  storageClassName: asteria
+  volumeName: pvc-ee0fac85-d81b-48ad-aa0e-837a4be409b7
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
 metadata:
   name: nextcloud-data
   namespace: nextcloud