From 15564296aba01901f0877062f30eaedc8aac88e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Wed, 26 Jul 2023 16:57:55 +0200
Subject: [PATCH] fix

---
 apps/nextcloud/configs.tf |  2 +-
 apps/nextcloud/datas.tf   |  1 +
 apps/nextcloud/index.yaml | 88 +++++++++++++++++++--------------------
 3 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/apps/nextcloud/configs.tf b/apps/nextcloud/configs.tf
index ba61cbe..3b023f0 100644
--- a/apps/nextcloud/configs.tf
+++ b/apps/nextcloud/configs.tf
@@ -3,7 +3,7 @@ locals {
   #!/bin/bash
   cp /etc/local-ca/ca.crt /usr/local/share/ca-certificates/
   /usr/sbin/update-ca-certificates
-  exec /bin/bash /entrypoint.sh "$@"
+  exec /bin/sh /entrypoint.sh "$@"
   EOF
     script-head = <<-EOF
   #!/bin/bash
diff --git a/apps/nextcloud/datas.tf b/apps/nextcloud/datas.tf
index 2909e90..926d965 100644
--- a/apps/nextcloud/datas.tf
+++ b/apps/nextcloud/datas.tf
@@ -61,6 +61,7 @@ data "kustomization_overlay" "data" {
               image: "${var.images.nextcloud.registry}/${var.images.nextcloud.repository}:${var.images.nextcloud.tag}"
               imagePullPolicy: "${var.images.nextcloud.pullPolicy}"
               command: ["/usr/local/bin/wrapper"]
+              args: ["%%CMD%%"]
               env:
               - name: POSTGRES_HOST
                 value: "${var.instance}-${var.component}"
diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml
index 3f491f3..3f783a6 100644
--- a/apps/nextcloud/index.yaml
+++ b/apps/nextcloud/index.yaml
@@ -6,39 +6,25 @@ metadata:
   name: nextcloud
   description: null
 options:
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 10Gi
+  ingress-class:
+    default: traefik
     examples:
-    - accessMode: ReadWriteOnce
-      size: 10Gi
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 10Gi
-        type: string
-    type: object
-  sub-domain:
-    default: cloud
-    examples:
-    - cloud
+    - traefik
     type: string
-  domain-name:
-    default: your_company.com
+  domain:
+    default: your-company
     examples:
-    - your_company.com
+    - your-company
     type: string
   apps:
     default:
@@ -188,21 +174,6 @@ options:
     examples:
     - vynil
     type: string
-  admin:
-    default:
-      name: nextcloud_admin
-    examples:
-    - name: nextcloud_admin
-    properties:
-      name:
-        default: nextcloud_admin
-        type: string
-    type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   redis:
     default:
       exporter:
@@ -236,11 +207,25 @@ options:
         default: 2Gi
         type: string
     type: object
-  domain:
-    default: your-company
+  storage:
+    default:
+      accessMode: ReadWriteOnce
+      size: 10Gi
     examples:
-    - your-company
-    type: string
+    - accessMode: ReadWriteOnce
+      size: 10Gi
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 10Gi
+        type: string
+    type: object
   postgres:
     default:
       replicas: 1
@@ -281,6 +266,21 @@ options:
         default: 1
         type: integer
     type: object
+  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
 dependencies: []
 providers:
   kubernetes: true