From fee882920dedfe2cf8e7ed56087d535348e98e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Tue, 18 Jul 2023 12:28:40 +0200
Subject: [PATCH] fix

---
 .../apps_v1_Deployment_nextcloud.yaml         |   5 +-
 apps/nextcloud/index.yaml                     | 158 +++++++++---------
 .../v1_ConfigMap_nextcloud-config.yaml        |   5 -
 3 files changed, 80 insertions(+), 88 deletions(-)

diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml
index e762c77..00dd2e2 100644
--- a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml
+++ b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml
@@ -25,7 +25,7 @@ spec:
         app.kubernetes.io/instance: nextcloud
         app.kubernetes.io/component: app
       annotations:
-        nextcloud-config-hash: 7b1af714bbfbc86d4f1033eac5aa1bc390f26fb3a525d74070eb0da2be379e53
+        nextcloud-config-hash: f06194ff9fd99e684e892f452ce917a6430ea723649f63c62eb1c56c1ba07699
         php-config-hash: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
         nginx-config-hash: 18dd8f905a93ed27f032e9ae68084222ed7e5926f7144cda17b979780f4da54b
     spec:
@@ -91,9 +91,6 @@ spec:
         - name: nextcloud-config
           mountPath: /var/www/html/config/locale.config.php
           subPath: locale.config.php
-        - name: nextcloud-config
-          mountPath: /var/www/html/config/proxy.config.php
-          subPath: proxy.config.php
         - name: nextcloud-config
           mountPath: /var/www/html/config/.htaccess
           subPath: .htaccess
diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml
index 7856105..d6d2f9f 100644
--- a/apps/nextcloud/index.yaml
+++ b/apps/nextcloud/index.yaml
@@ -6,11 +6,36 @@ metadata:
   name: nextcloud
   description: null
 options:
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   sub-domain:
     default: cloud
     examples:
     - cloud
     type: string
+  admin:
+    default:
+      name: nextcloud_admin
+    examples:
+    - name: nextcloud_admin
+    properties:
+      name:
+        default: nextcloud_admin
+        type: string
+    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   issuer:
     default: letsencrypt-prod
     examples:
@@ -49,80 +74,6 @@ options:
         default: 2Gi
         type: string
     type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  postgres:
-    default:
-      replicas: 1
-      storage: 5Gi
-      version: '14'
-    examples:
-    - replicas: 1
-      storage: 5Gi
-      version: '14'
-    properties:
-      replicas:
-        default: 1
-        type: integer
-      storage:
-        default: 5Gi
-        type: string
-      version:
-        default: '14'
-        type: string
-    type: object
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 10Gi
-    examples:
-    - accessMode: ReadWriteOnce
-      size: 10Gi
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 10Gi
-        type: string
-    type: object
-  hpa:
-    default:
-      avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    examples:
-    - avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    properties:
-      avg-cpu:
-        default: 50
-        type: integer
-      max-replicas:
-        default: 5
-        type: integer
-      min-replicas:
-        default: 1
-        type: integer
-    type: object
   images:
     default:
       exporter:
@@ -226,15 +177,64 @@ options:
             type: string
         type: object
     type: object
-  admin:
+  postgres:
     default:
-      name: nextcloud_admin
+      replicas: 1
+      storage: 5Gi
+      version: '14'
     examples:
-    - name: nextcloud_admin
+    - replicas: 1
+      storage: 5Gi
+      version: '14'
     properties:
-      name:
-        default: nextcloud_admin
+      replicas:
+        default: 1
+        type: integer
+      storage:
+        default: 5Gi
         type: string
+      version:
+        default: '14'
+        type: string
+    type: object
+  storage:
+    default:
+      accessMode: ReadWriteOnce
+      size: 10Gi
+    examples:
+    - accessMode: ReadWriteOnce
+      size: 10Gi
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 10Gi
+        type: string
+    type: object
+  hpa:
+    default:
+      avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    examples:
+    - avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    properties:
+      avg-cpu:
+        default: 50
+        type: integer
+      max-replicas:
+        default: 5
+        type: integer
+      min-replicas:
+        default: 1
+        type: integer
     type: object
 dependencies: []
 providers:
diff --git a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml
index 4d5c341..c1e8e02 100644
--- a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml
+++ b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml
@@ -18,12 +18,7 @@ data:
       'log_type' => 'errorlog',
       'loglevel' => 0,
       'logdateformat' => 'F d, Y H:i:s',
-    );
-  proxy.config.php: |-
-    <?php
-    $CONFIG = array (
       'trusted_proxies' => array('10.244.0.0/16','2001:cafe:42::1'),
-      'overwriteprotocol' => 'https',
     );
   .htaccess: |-
     # line below if for Apache 2.4