fix

apps/nextcloud/index.yaml

@@ -30,10 +30,10 @@ options:
     examples:
     - vynil
     type: string
-  domain:
-    default: your-company
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - your-company
+    - letsencrypt-prod
     type: string
   images:
     default:
@@ -138,89 +138,6 @@ options:
             type: string
         type: object
     type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    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
-  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
-  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
   apps:
     default:
       calendar: false
@@ -261,6 +178,41 @@ options:
         default: false
         type: boolean
     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
+  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
   postgres:
     default:
       replicas: 1
@@ -281,6 +233,54 @@ options:
         default: '14'
         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-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
 dependencies: []
 providers:
   kubernetes: true

apps/nextcloud/oauth2.tf

@@ -15,7 +15,7 @@ resource "kubectl_manifest" "oauth2-secret" {
   EOF
 }
 data "kubernetes_secret_v1" "oauth2-client-id" {
-  depends_on = [kubectl_manifest.gitea_ldap]
+  depends_on = [kubectl_manifest.oauth2-secret]
   metadata {
     name = kubectl_manifest.oauth2-secret.name
     namespace = var.namespace

share/dns/config.tf

@@ -23,9 +23,9 @@ locals {
     @    IN NS   ${var.sub-domain}.${var.domain-name}.
   EOF
   files = merge({
-    "Corefile" = join("\n", concat([local.begin-core],[for z in var.zones: format("file /etc/coredns/%s.db %s", z.name,z.name)],[local.end-core]))
+    "Corefile" = join("\n", concat([local.begin-core],[for z in var.zones: format("file /etc/coredns/%s %s", z.name,z.name)],[local.end-core]))
   },[for z in var.zones: {
-    "${z.name}.db" = join("\n", concat([
+    "${z.name}" = join("\n", concat([
       "$TTL 60",
       "$ORIGIN ${z.name}.",
       local.soa-ns

share/dns/index.yaml

@@ -6,11 +6,45 @@ metadata:
   name: dns
   description: null
 options:
+  zones:
+    default: []
+    items:
+      properties:
+        alias:
+          default: {}
+          type: object
+        hosts:
+          default: {}
+          type: object
+        hosts6:
+          default: {}
+          type: object
+        name:
+          default: local.domain
+          type: string
+        wildcard:
+          default: ''
+          type: string
+        wildcard6:
+          default: ''
+          type: string
+      type: object
+    type: array
+  sub-domain:
+    default: dns
+    examples:
+    - dns
+    type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   image:
     default:
       pullPolicy: IfNotPresent
@@ -40,40 +74,6 @@ options:
         default: 1.10.1
         type: string
     type: object
-  zones:
-    default: []
-    items:
-      properties:
-        alias:
-          default: {}
-          type: object
-        hosts:
-          default: {}
-          type: object
-        hosts6:
-          default: {}
-          type: object
-        name:
-          default: local.domain
-          type: string
-        wildcard:
-          default: ''
-          type: string
-        wildcard6:
-          default: ''
-          type: string
-      type: object
-    type: array
-  sub-domain:
-    default: dns
-    examples:
-    - dns
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
 dependencies: []
 providers:
   kubernetes: true