fix

meta/domain-ci/apps.tf

@@ -46,15 +46,15 @@ locals {
       "class"      = var.storage.volume.class
     }
     gitea = merge(local.global,{ for k, v in var.gitea : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.gitea, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.gitea, "backups", {}))
       storage = merge({ for k, v in lookup(var.gitea, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.gitea, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.gitea, "storage", {}), "volume", {}))
       })
     })
     woodpecker = merge(local.global,{ for k, v in var.woodpecker : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.woodpecker, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.woodpecker, "backups", {}))
       storage = merge({ for k, v in lookup(var.woodpecker, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.woodpecker, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.woodpecker, "storage", {}), "volume", {}))
       })
     })
 }

meta/domain-ci/index.yaml

@@ -6,98 +6,6 @@ metadata:
   name: domain-ci
   description: null
 options:
-  timezone:
-    default: Europe/Paris
-    examples:
-    - Europe/Paris
-    type: string
-  distributions:
-    default:
-      core: core
-      domain: domain
-    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  storage:
-    default:
-      volume:
-        accessMode: ReadWriteOnce
-        class: ''
-    examples:
-    - volume:
-        accessMode: ReadWriteOnce
-        class: ''
-    properties:
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          class: ''
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            type: string
-          class:
-            default: ''
-            type: string
-        type: object
-    type: object
-  gitea:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: gitea
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  sso_vynil:
-    default: true
-    examples:
-    - true
-    type: boolean
-  woodpecker:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: woodpecker
-  language:
-    default: fr_FR
-    examples:
-    - fr_FR
-    type: string
-  domain_name:
-    default: your-company.com
-    examples:
-    - your-company.com
-    type: string
   app_group:
     default: dev
     examples:
@@ -143,17 +51,110 @@ options:
         default: false
         type: boolean
     type: object
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
   domain:
     default: your-company
     examples:
     - your-company
     type: string
+  domain_name:
+    default: your-company.com
+    examples:
+    - your-company.com
+    type: string
+  gitea:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: gitea
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  language:
+    default: fr_FR
+    examples:
+    - fr_FR
+    type: string
+  sso_vynil:
+    default: true
+    examples:
+    - true
+    type: boolean
+  storage:
+    default:
+      volume:
+        accessMode: ReadWriteOnce
+        class: ''
+    examples:
+    - volume:
+        accessMode: ReadWriteOnce
+        class: ''
+    properties:
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          class: ''
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            type: string
+          class:
+            default: ''
+            type: string
+        type: object
+    type: object
+  timezone:
+    default: Europe/Paris
+    examples:
+    - Europe/Paris
+    type: string
+  woodpecker:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: woodpecker
 dependencies: []
 providers:
   kubernetes: true
   authentik: null
   kubectl: true
   postgresql: null
+  mysql: null
   restapi: null
   http: null
   gitea: null