From f5871b8d0e8058849955c695e29368781d78d7e0 Mon Sep 17 00:00:00 2001
From: Massaki Archambault <marchambault@badjware.dev>
Date: Mon, 12 Jun 2023 13:29:18 -0400
Subject: [PATCH] tweak nextcloud config

---
 .../bases/nextcloud/configurations/apache-user.conf  |  2 ++
 kustomize/bases/nextcloud/kustomization.yaml         |  3 ++-
 kustomize/bases/nextcloud/nextcloud-deployment.yaml  | 12 ++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 kustomize/bases/nextcloud/configurations/apache-user.conf

diff --git a/kustomize/bases/nextcloud/configurations/apache-user.conf b/kustomize/bases/nextcloud/configurations/apache-user.conf
new file mode 100644
index 0000000..dd6f27d
--- /dev/null
+++ b/kustomize/bases/nextcloud/configurations/apache-user.conf
@@ -0,0 +1,2 @@
+# Mitigate an issue with CPU starvation in photo app
+MaxRequestWorkers 50
diff --git a/kustomize/bases/nextcloud/kustomization.yaml b/kustomize/bases/nextcloud/kustomization.yaml
index fb93b7f..06cec89 100644
--- a/kustomize/bases/nextcloud/kustomization.yaml
+++ b/kustomize/bases/nextcloud/kustomization.yaml
@@ -11,9 +11,10 @@ commonLabels:
   app.kubernetes.io/name: nextcloud
 
 configMapGenerator:
-  - name: php-ini
+  - name: server-config
     files:
       - php-user.ini=configurations/php-user.ini
+      - apache-user.cfg=configurations/apache-user.conf
   - name: kustomize-generated-config
     literals:
       - NEXTCLOUD_EXTERNAL_HOST=cloud.badjware.dev
diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml
index ca957eb..40e13e3 100644
--- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml
+++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml
@@ -90,17 +90,21 @@ spec:
           volumeMounts:
             - name: nextcloud-pv
               mountPath: /var/www/html
-            - name: php-ini
+            - name: server-config
               mountPath: /usr/local/etc/php/conf.d/php-user.ini
               subPath: php-user.ini
               readOnly: true
+            - name: server-config
+              mountPath: /etc/apache2/conf-enabled/apache-user.conf
+              subPath: apache-user.conf
+              readOnly: true
       volumes:
         - name: nextcloud-pv
           persistentVolumeClaim:
             claimName: server-pvc
-        - name: php-ini
+        - name: server-config
           configMap:
-            name: php-ini
+            name: server-config
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -111,7 +115,7 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 20Gi
+      storage: 100Gi
 ---
 apiVersion: v1
 kind: Service