fix

2024-01-26 16:44:44 +01:00
parent 4d8e42f0f6
commit 01ca8c2a13
59 changed files with 1018 additions and 1018 deletions
--- a/apps/nextcloud/backups.tf
+++ b/apps/nextcloud/backups.tf
@@ -10,17 +10,17 @@ resource "kubectl_manifest" "backup_schedule" {
    spec:
      backend:
        repoPasswordSecretRef:
-          key: "${var.backups.restic-key}"
-          name: "${var.backups.secret-name}"
+          key: "${var.backups.restic_key}"
+          name: "${var.backups.secret_name}"
        s3:
          accessKeyIDSecretRef:
-            key: "${var.backups.key-id-key}"
-            name: "${var.backups.secret-name}"
+            key: "${var.backups.key_id_key}"
+            name: "${var.backups.secret_name}"
          bucket: "${var.instance}-${var.namespace}"
          endpoint: "${var.backups.endpoint}/restic"
          secretAccessKeySecretRef:
-            key: "${var.backups.secret-key}"
-            name: "${var.backups.secret-name}"
+            key: "${var.backups.secret_key}"
+            name: "${var.backups.secret_name}"
      backup:
        schedule: "${var.backups.schedule.backup}"
        failedJobsHistoryLimit: 2
--- a/apps/nextcloud/index.yaml
+++ b/apps/nextcloud/index.yaml
@@ -6,67 +6,6 @@ metadata:
  name: nextcloud
  description: null
 options:
-  storage:
-    default:
-      postgres:
-        size: 5Gi
-      redis:
-        size: 2Gi
-      volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    description: Configure this app storage
-    examples:
-    - postgres:
-        size: 5Gi
-      redis:
-        size: 2Gi
-      volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    properties:
-      postgres:
-        default:
-          size: 5Gi
-        properties:
-          size:
-            default: 5Gi
-            type: string
-        type: object
-      redis:
-        default:
-          size: 2Gi
-        properties:
-          size:
-            default: 2Gi
-            type: string
-        type: object
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          size: 10Gi
-          type: Filesystem
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            enum:
-            - ReadWriteOnce
-            - ReadOnlyMany
-            - ReadWriteMany
-            type: string
-          size:
-            default: 10Gi
-            type: string
-          type:
-            default: Filesystem
-            enum:
-            - Filesystem
-            - Block
-            type: string
-        type: object
-    type: object
  images:
    default:
      collabora:
@@ -322,32 +261,37 @@ options:
            type: string
        type: object
    type: object
-  hpa:
-    default:
-      avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
+  openid-name:
+    default: vynil
    examples:
-    - avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
+    - vynil
+    type: string
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
    properties:
-      avg-cpu:
-        default: 50
-        type: integer
-      max-replicas:
-        default: 5
-        type: integer
-      min-replicas:
+      replicas:
        default: 1
        type: integer
    type: object
+  sub_domain:
+    default: files
+    examples:
+    - files
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
  backups:
    default:
      enable: false
      endpoint: ''
-      key-id-key: s3-id
-      restic-key: bck-password
+      key_id_key: s3-id
+      restic_key: bck-password
      retention:
        db: 30d
        keepDaily: 14
@@ -359,14 +303,14 @@ options:
        check: 30 5 * * 1
        db: 30 3 * * *
        prune: 30 1 * * 0
-      secret-key: s3-secret
-      secret-name: backup-settings
-      use-barman: false
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use_barman: false
    examples:
    - enable: false
      endpoint: ''
-      key-id-key: s3-id
-      restic-key: bck-password
+      key_id_key: s3-id
+      restic_key: bck-password
      retention:
        db: 30d
        keepDaily: 14
@@ -378,9 +322,9 @@ options:
        check: 30 5 * * 1
        db: 30 3 * * *
        prune: 30 1 * * 0
-      secret-key: s3-secret
-      secret-name: backup-settings
-      use-barman: false
+      secret_key: s3-secret
+      secret_name: backup-settings
+      use_barman: false
    properties:
      enable:
        default: false
@@ -388,10 +332,10 @@ options:
      endpoint:
        default: ''
        type: string
-      key-id-key:
+      key_id_key:
        default: s3-id
        type: string
-      restic-key:
+      restic_key:
        default: bck-password
        type: string
      retention:
@@ -438,41 +382,77 @@ options:
            default: 30 1 * * 0
            type: string
        type: object
-      secret-key:
+      secret_key:
        default: s3-secret
        type: string
-      secret-name:
+      secret_name:
        default: backup-settings
        type: string
-      use-barman:
+      use_barman:
        default: false
        type: boolean
    type: object
-  admin:
+  storage:
    default:
-      name: nextcloud_admin
+      postgres:
+        size: 5Gi
+      redis:
+        size: 2Gi
+      volume:
+        accessMode: ReadWriteOnce
+        size: 10Gi
+        type: Filesystem
+    description: Configure this app storage
    examples:
-    - name: nextcloud_admin
+    - postgres:
+        size: 5Gi
+      redis:
+        size: 2Gi
+      volume:
+        accessMode: ReadWriteOnce
+        size: 10Gi
+        type: Filesystem
    properties:
-      name:
-        default: nextcloud_admin
-        type: string
+      postgres:
+        default:
+          size: 5Gi
+        properties:
+          size:
+            default: 5Gi
+            type: string
+        type: object
+      redis:
+        default:
+          size: 2Gi
+        properties:
+          size:
+            default: 2Gi
+            type: string
+        type: object
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          size: 10Gi
+          type: Filesystem
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            enum:
+            - ReadWriteOnce
+            - ReadOnlyMany
+            - ReadWriteMany
+            type: string
+          size:
+            default: 10Gi
+            type: string
+          type:
+            default: Filesystem
+            enum:
+            - Filesystem
+            - Block
+            type: string
+        type: object
    type: object
-  openid-name:
-    default: vynil
-    examples:
-    - vynil
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
  redis:
    default:
      exporter:
@@ -490,36 +470,56 @@ options:
            type: boolean
        type: object
    type: object
+  admin:
+    default:
+      name: nextcloud_admin
+    examples:
+    - name: nextcloud_admin
+    properties:
+      name:
+        default: nextcloud_admin
+        type: string
+    type: object
  app_group:
    default: ''
    examples:
    - ''
    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
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    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: files
-    examples:
-    - files
-    type: string
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
  apps:
    default:
      audioplayer: false
--- a/apps/nextcloud/postgresql.tf
+++ b/apps/nextcloud/postgresql.tf
@@ -27,18 +27,18 @@ resource "kubectl_manifest" "prj_pg" {
      monitoring:
        enablePodMonitor: true
  EOF
-  ], var.backups.enable&&var.backups.use-barman?[<<-EOF
+  ], var.backups.enable&&var.backups.use_barman?[<<-EOF
      backup:
        barmanObjectStore:
          destinationPath: "s3://${var.instance}-${var.namespace}/"
          endpointURL: "${var.backups.endpoint}/barman"
          s3Credentials:
            accessKeyId:
-              name: "${var.backups.secret-name}"
-              key: "${var.backups.key-id-key}"
+              name: "${var.backups.secret_name}"
+              key: "${var.backups.key_id_key}"
            secretAccessKey:
-              name: "${var.backups.secret-name}"
-              key: "${var.backups.secret-key}"
+              name: "${var.backups.secret_name}"
+              key: "${var.backups.secret_key}"
  EOF
  ]:[""]))
 }
--- a/apps/nextcloud/presentation.tf
+++ b/apps/nextcloud/presentation.tf
@@ -1,5 +1,5 @@
 locals {
-  dns_name = "${var.sub-domain}.${var.domain_name}"
+  dns_name = "${var.sub_domain}.${var.domain_name}"
  dns-collabora = "collabora.${local.dns_name}"
  dns-onlyoffice = "onlyoffice.${local.dns_name}"
  dns_names = [local.dns_name]