From f9a65dfafb596ef07731d86cc2afebe405d3ea10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Wed, 26 Jul 2023 16:48:43 +0200 Subject: [PATCH] fix --- apps/nextcloud/configs.tf | 4 +- apps/nextcloud/index.yaml | 214 +++++++++++++++++++------------------- 2 files changed, 109 insertions(+), 109 deletions(-) diff --git a/apps/nextcloud/configs.tf b/apps/nextcloud/configs.tf index 24cd61c..ba61cbe 100644 --- a/apps/nextcloud/configs.tf +++ b/apps/nextcloud/configs.tf @@ -2,8 +2,8 @@ locals { script-wrap = <<-EOF #!/bin/bash cp /etc/local-ca/ca.crt /usr/local/share/ca-certificates/ - update-ca-certificate - exec /entrypoint.sh "$@" + /usr/sbin/update-ca-certificates + exec /bin/bash /entrypoint.sh "$@" EOF script-head = <<-EOF #!/bin/bash diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml index a41c517..3f491f3 100644 --- a/apps/nextcloud/index.yaml +++ b/apps/nextcloud/index.yaml @@ -11,59 +11,6 @@ options: examples: - letsencrypt-prod type: string - redis: - default: - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.5 - storage: 2Gi - examples: - - exporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - image: quay.io/opstree/redis:v7.0.5 - storage: 2Gi - properties: - exporter: - default: - enabled: true - image: quay.io/opstree/redis-exporter:v1.44.0 - properties: - enabled: - default: true - type: boolean - image: - default: quay.io/opstree/redis-exporter:v1.44.0 - type: string - type: object - image: - default: quay.io/opstree/redis:v7.0.5 - type: string - storage: - default: 2Gi - type: string - type: object - 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 @@ -83,26 +30,16 @@ options: default: 10Gi type: string type: object - hpa: - default: - avg-cpu: 50 - max-replicas: 5 - min-replicas: 1 + sub-domain: + default: cloud 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 + - cloud + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string apps: default: calendar: false @@ -143,41 +80,6 @@ options: default: false type: boolean type: object - admin: - default: - name: nextcloud_admin - examples: - - name: nextcloud_admin - properties: - name: - default: nextcloud_admin - type: string - type: object - openid-name: - default: vynil - examples: - - vynil - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - domain: - default: your-company - examples: - - your-company - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - sub-domain: - default: cloud - examples: - - cloud - type: string images: default: exporter: @@ -281,6 +183,104 @@ options: type: string type: object type: object + openid-name: + default: vynil + 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: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi + examples: + - exporter: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + image: quay.io/opstree/redis:v7.0.5 + storage: 2Gi + properties: + exporter: + default: + enabled: true + image: quay.io/opstree/redis-exporter:v1.44.0 + properties: + enabled: + default: true + type: boolean + image: + default: quay.io/opstree/redis-exporter:v1.44.0 + type: string + type: object + image: + default: quay.io/opstree/redis:v7.0.5 + type: string + storage: + default: 2Gi + type: string + 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 + 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: kubernetes: true