From ef82777d4d58375c2c2d2ea7aafe2e27a20a39b4 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:26:48 +0200
Subject: [PATCH] fix

---
 .../apps_v1_Deployment_nextcloud.yaml         |   5 +-
 apps/nextcloud/index.yaml                     | 122 +++++++++---------
 .../v1_ConfigMap_nextcloud-config.yaml        |   6 +
 3 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml
index 796c33f..e762c77 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: d4320fdaefff5b70c7a5104cb95c93f3525ec8c8ca505ca7d8b36aea48f2539c
+        nextcloud-config-hash: 7b1af714bbfbc86d4f1033eac5aa1bc390f26fb3a525d74070eb0da2be379e53
         php-config-hash: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
         nginx-config-hash: 18dd8f905a93ed27f032e9ae68084222ed7e5926f7144cda17b979780f4da54b
     spec:
@@ -91,6 +91,9 @@ 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 3164f56..7856105 100644
--- a/apps/nextcloud/index.yaml
+++ b/apps/nextcloud/index.yaml
@@ -16,61 +16,6 @@ options:
     examples:
     - letsencrypt-prod
     type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  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
-  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
   redis:
     default:
       exporter:
@@ -104,6 +49,41 @@ 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
@@ -123,15 +103,25 @@ options:
         default: 10Gi
         type: string
     type: object
-  admin:
+  hpa:
     default:
-      name: nextcloud_admin
+      avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
     examples:
-    - name: nextcloud_admin
+    - avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
     properties:
-      name:
-        default: nextcloud_admin
-        type: string
+      avg-cpu:
+        default: 50
+        type: integer
+      max-replicas:
+        default: 5
+        type: integer
+      min-replicas:
+        default: 1
+        type: integer
     type: object
   images:
     default:
@@ -236,6 +226,16 @@ options:
             type: string
         type: object
     type: object
+  admin:
+    default:
+      name: nextcloud_admin
+    examples:
+    - name: nextcloud_admin
+    properties:
+      name:
+        default: nextcloud_admin
+        type: string
+    type: object
 dependencies: []
 providers:
   kubernetes: true
diff --git a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml
index 408489c..4d5c341 100644
--- a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml
+++ b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml
@@ -19,6 +19,12 @@ data:
       '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
     <ifModule mod_authz_core.c>