fix

2024-01-26 10:19:34 +01:00
parent e8ad81c3db
commit 94e78fa7e9
187 changed files with 3355 additions and 2857 deletions
--- a/share/accounts-management/index.yaml
+++ b/share/accounts-management/index.yaml
@@ -11,23 +11,6 @@ options:
    examples:
    - your-company
    type: string
-  clients:
-    default:
-      apps: []
-      enable: false
-    examples:
-    - apps: []
-      enable: false
-    properties:
-      apps:
-        default: []
-        items:
-          type: string
-        type: array
-      enable:
-        default: false
-        type: boolean
-    type: object
  fournisseurs:
    default:
      apps: []
@@ -57,6 +40,23 @@ options:
          type: string
        type: array
    type: object
+  clients:
+    default:
+      apps: []
+      enable: false
+    examples:
+    - apps: []
+      enable: false
+    properties:
+      apps:
+        default: []
+        items:
+          type: string
+        type: array
+      enable:
+        default: false
+        type: boolean
+    type: object
 dependencies:
 - dist: null
  category: share
--- a/share/authentik-forward/index.yaml
+++ b/share/authentik-forward/index.yaml
@@ -6,28 +6,28 @@ metadata:
  name: authentik-forward
  description: null
 options:
-  issuer:
-    default: letsencrypt-prod
+  sub-domain:
+    default: null
+  domain-name:
+    default: your_company.com
    examples:
-    - letsencrypt-prod
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
+    - your_company.com
    type: string
  domain:
    default: your-company
    examples:
    - your-company
    type: string
-  domain_name:
-    default: your_company.com
+  issuer:
+    default: letsencrypt-prod
    examples:
-    - your_company.com
+    - letsencrypt-prod
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
    type: string
-  sub_domain:
-    default: null
 dependencies:
 - dist: null
  category: share
--- a/share/authentik/datas.tf
+++ b/share/authentik/datas.tf
@@ -46,7 +46,7 @@ data "kustomization_overlay" "data" {
      "AUTHENTIK_POSTGRESQL__PORT=5432",
      "AUTHENTIK_POSTGRESQL__USER=${var.component}",
      "AUTHENTIK_REDIS__HOST=${var.name}-${var.component}-redis",
-      "AUTHENTIK_BOOTSTRAP_EMAIL=${var.admin.email}@${var.domain_name}",
+      "AUTHENTIK_BOOTSTRAP_EMAIL=${var.admin.email}@${var.domain-name}",
    ]
  }
  patches {
--- a/share/authentik/index.yaml
+++ b/share/authentik/index.yaml
@@ -23,16 +23,41 @@ options:
            type: boolean
        type: object
    type: object
-  postgres:
-    default:
-      replicas: 1
+  ingress-class:
+    default: traefik
    examples:
-    - replicas: 1
+    - traefik
+    type: string
+  email:
+    default:
+      port: 587
+      timeout: 30
+      use_ssl: false
+      use_tls: false
+    examples:
+    - port: 587
+      timeout: 30
+      use_ssl: false
+      use_tls: false
    properties:
-      replicas:
-        default: 1
+      port:
+        default: 587
        type: integer
+      timeout:
+        default: 30
+        type: integer
+      use_ssl:
+        default: false
+        type: boolean
+      use_tls:
+        default: false
+        type: boolean
    type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
  storage:
    default:
      postgres:
@@ -199,35 +224,10 @@ options:
            type: string
        type: object
    type: object
-  loglevel:
-    default: info
+  domain:
+    default: your-company
    examples:
-    - info
-    type: string
-  error_reporting:
-    default:
-      enabled: false
-      environment: k8s
-      send_pii: false
-    examples:
-    - enabled: false
-      environment: k8s
-      send_pii: false
-    properties:
-      enabled:
-        default: false
-        type: boolean
-      environment:
-        default: k8s
-        type: string
-      send_pii:
-        default: false
-        type: boolean
-    type: object
-  geoip:
-    default: /geoip/GeoLite2-City.mmdb
-    examples:
-    - /geoip/GeoLite2-City.mmdb
+    - your-company
    type: string
  backups:
    default:
@@ -288,45 +288,30 @@ options:
        default: false
        type: boolean
    type: object
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  email:
+  error_reporting:
    default:
-      port: 587
-      timeout: 30
-      use_ssl: false
-      use_tls: false
+      enabled: false
+      environment: k8s
+      send_pii: false
    examples:
-    - port: 587
-      timeout: 30
-      use_ssl: false
-      use_tls: false
+    - enabled: false
+      environment: k8s
+      send_pii: false
    properties:
-      port:
-        default: 587
-        type: integer
-      timeout:
-        default: 30
-        type: integer
-      use_ssl:
+      enabled:
        default: false
        type: boolean
-      use_tls:
+      environment:
+        default: k8s
+        type: string
+      send_pii:
        default: false
        type: boolean
    type: object
-  issuer:
-    default: letsencrypt-prod
+  loglevel:
+    default: info
    examples:
-    - letsencrypt-prod
+    - info
    type: string
  admin:
    default:
@@ -338,16 +323,31 @@ options:
        default: auth-admin
        type: string
    type: object
-  domain:
-    default: your-company
+  postgres:
+    default:
+      replicas: 1
    examples:
-    - your-company
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  geoip:
+    default: /geoip/GeoLite2-City.mmdb
+    examples:
+    - /geoip/GeoLite2-City.mmdb
    type: string
-  sub_domain:
+  sub-domain:
    default: auth
    examples:
    - auth
    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
 dependencies:
 - dist: null
  category: core
--- a/share/authentik/ingress.tf
+++ b/share/authentik/ingress.tf
@@ -1,5 +1,5 @@
 locals {
-    dns_names = ["${var.sub_domain}.${var.domain_name}"]
+    dns_names = ["${var.sub-domain}.${var.domain-name}"]
    middlewares = ["${var.instance}-https"]
    service = {
      "name"  = "${var.instance}"
@@ -66,7 +66,7 @@ resource "kubectl_manifest" "prj_ingress" {
      annotations:
        "traefik.ingress.kubernetes.io/router.middlewares": "${join(",", [for m in local.middlewares : format("%s-%s@kubernetescrd", var.namespace, m)])}"
    spec:
-      ingressClassName: "${var.ingress_class}"
+      ingressClassName: "${var.ingress-class}"
      rules: ${jsonencode(local.rules)}
      tls:
      - hosts: ${jsonencode(local.dns_names)}
--- a/share/dataset-maria/mariadb.tf
+++ b/share/dataset-maria/mariadb.tf
@@ -40,6 +40,8 @@ resource "kubectl_manifest" "prj_mariadb" {
      namespace: "${var.namespace}"
      labels: ${jsonencode(local.maria-labels)}
    spec:
+      image: "${var.images.mariadb.registry}/${var.images.mariadb.repository}:${var.images.mariadb.tag}"
+      imagePullPolicy: "${var.images.mariadb.pullPolicy}"
      rootPasswordSecretKeyRef:
        key: root-password
        name: "${var.instance}-${var.component}"
--- a/share/dataset-mongo/index.yaml
+++ b/share/dataset-mongo/index.yaml
@@ -47,26 +47,6 @@ options:
            type: string
        type: object
    type: object
-  cacheSizeGB:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  mongo:
-    default:
-      version: 7.0.2
-    examples:
-    - version: 7.0.2
-    properties:
-      version:
-        default: 7.0.2
-        type: string
-    type: object
  image:
    default:
      pullPolicy: IfNotPresent
@@ -81,6 +61,26 @@ options:
        - IfNotPresent
        type: string
    type: object
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  cacheSizeGB:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  mongo:
+    default:
+      version: 7.0.2
+    examples:
+    - version: 7.0.2
+    properties:
+      version:
+        default: 7.0.2
+        type: string
+    type: object
 dependencies:
 - dist: null
  category: dbo
--- a/share/dataset-pg/directus.tf
+++ b/share/dataset-pg/directus.tf
@@ -45,13 +45,13 @@ resource "kubectl_manifest" "directus_config" {
      DB_PORT: "5432"
      STORAGE_LOCATIONS: "local"
      STORAGE_LOCAL_ROOT: "/var/store"
-      ADMIN_EMAIL: "admin@${var.domain_name}"
+      ADMIN_EMAIL: "admin@${var.domain-name}"
      NODE_EXTRA_CA_CERTS: "/etc/local-ca/ca.crt"
      TELEMETRY: "false"
      AUTH_PROVIDERS: "VYNIL"
      AUTH_VYNIL_DRIVER: "openid"
      AUTH_VYNIL_ALLOW_PUBLIC_REGISTRATION: "true"
-      AUTH_VYNIL_ISSUER_URL: "https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/o/directus-${replace(var.sub_domain, ".", "-")}-${var.instance}/.well-known/openid-configuration"
+      AUTH_VYNIL_ISSUER_URL: "https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/o/directus-${replace(var.sub-domain, ".", "-")}-${var.instance}/.well-known/openid-configuration"
      AUTH_VYNIL_IDENTIFIER_KEY: "email"
      PUBLIC_URL: "https://${local.directus-dns_name}"
  EOF
@@ -133,12 +133,12 @@ resource "kubectl_manifest" "directus_deploy" {
              valueFrom:
                secretKeyRef:
                  key: "client-id"
-                  name: "directus-${replace(var.sub_domain, ".", "-")}-${var.instance}-id"
+                  name: "directus-${replace(var.sub-domain, ".", "-")}-${var.instance}-id"
            - name: AUTH_VYNIL_CLIENT_SECRET
              valueFrom:
                secretKeyRef:
                  key: "client-secret"
-                  name: "directus-${replace(var.sub_domain, ".", "-")}-${var.instance}-secret"
+                  name: "directus-${replace(var.sub-domain, ".", "-")}-${var.instance}-secret"
            - name: DB_USER
              valueFrom:
                secretKeyRef:
@@ -216,7 +216,7 @@ module "directus-ingress" {
  instance          = var.instance
  namespace         = var.namespace
  issuer            = var.issuer
-  ingress_class     = var.ingress_class
+  ingress-class     = var.ingress-class
  labels            = local.directus-labels
  dns_names         = [local.directus-dns_name]
  create-redirect   = true
@@ -230,9 +230,9 @@ module "directus-ingress" {
 module "directus-application" {
  count = var.extentions.directus.enable ? 1 : 0
  source = "/dist/modules/application"
-  component         = "directus-${replace(var.sub_domain, ".", "-")}"
+  component         = "directus-${replace(var.sub-domain, ".", "-")}"
  instance          = var.instance
-  app_group         = var.app_group
+  app-group         = var.app-group
  dns_name          = local.directus-dns_name
  icon              = local.directus-icon
  protocol_provider = module.directus-oauth2[0].provider-id
@@ -244,7 +244,7 @@ module "directus-application" {
 module "directus-oauth2" {
  count = var.extentions.directus.enable ? 1 : 0
  source = "/dist/modules/oauth2"
-  component         = "directus-${replace(var.sub_domain, ".", "-")}"
+  component         = "directus-${replace(var.sub-domain, ".", "-")}"
  instance          = var.instance
  namespace         = var.namespace
  labels            = local.directus-labels
--- a/share/dataset-pg/index.yaml
+++ b/share/dataset-pg/index.yaml
@@ -6,7 +6,17 @@ metadata:
  name: dataset-pg
  description: null
 options:
-  sub_domain:
+  app-group:
+    default: api
+    examples:
+    - api
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  sub-domain:
    default: dataset-pg
    examples:
    - dataset-pg
@@ -28,30 +38,10 @@ options:
            type: string
        type: object
    type: object
-  postgres:
-    default:
-      replicas: 1
+  issuer:
+    default: letsencrypt-prod
    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  app_group:
-    default: api
-    examples:
-    - api
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
+    - letsencrypt-prod
    type: string
  extentions:
    default:
@@ -234,15 +224,6 @@ options:
            type: object
        type: object
    type: object
-  databases:
-    default: []
-    items:
-      properties:
-        name:
-          default: db
-          type: string
-      type: object
-    type: array
  backups:
    default:
      enable: false
@@ -297,16 +278,29 @@ options:
        default: backup-settings
        type: string
    type: object
-  domain_name:
-    default: your_company.com
+  ingress-class:
+    default: traefik
    examples:
-    - your_company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
+    - traefik
    type: string
+  databases:
+    default: []
+    items:
+      properties:
+        name:
+          default: db
+          type: string
+      type: object
+    type: array
+  roles:
+    default: []
+    items:
+      properties:
+        name:
+          default: alt-account
+          type: string
+      type: object
+    type: array
  images:
    default:
      postgresql:
@@ -336,15 +330,21 @@ options:
            type: number
        type: object
    type: object
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: alt-account
-          type: string
-      type: object
-    type: array
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
 dependencies:
 - dist: null
  category: dbo
--- a/share/dataset-pg/postgresql.tf
+++ b/share/dataset-pg/postgresql.tf
@@ -1,5 +1,5 @@
 locals {
-  dns_name  = "${var.instance}.${var.sub_domain}.${var.domain_name}"
+  dns_name  = "${var.instance}.${var.sub-domain}.${var.domain-name}"
  pg-labels = merge(local.common-labels, {
    "app.kubernetes.io/component" = "postgresql"
  })
--- a/share/dataset-pg/postgrest.tf
+++ b/share/dataset-pg/postgrest.tf
@@ -152,7 +152,7 @@ module "postgrest-ingress" {
  instance          = var.instance
  namespace         = var.namespace
  issuer            = var.issuer
-  ingress_class     = var.ingress_class
+  ingress-class     = var.ingress-class
  labels            = local.prest-labels
  dns_names         = [local.prest-dns_name]
  create-redirect   = true
@@ -184,7 +184,7 @@ module "swagger-ingress" {
  instance          = var.instance
  namespace         = var.namespace
  issuer            = var.issuer
-  ingress_class     = var.ingress_class
+  ingress-class     = var.ingress-class
  labels            = local.prest-labels
  dns_names         = [local.prest-dns_name]
  middlewares       = []
--- a/share/dataset-rabbit/index.yaml
+++ b/share/dataset-rabbit/index.yaml
@@ -6,45 +6,16 @@ metadata:
  name: dataset-rabbit
  description: null
 options:
-  images:
-    default:
-      rabbit:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: rabbitmq
-        tag: 3.10.2-management
+  storage:
+    default: 8Gi
    examples:
-    - rabbit:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: rabbitmq
-        tag: 3.10.2-management
-    properties:
-      rabbit:
-        default:
-          pullPolicy: IfNotPresent
-          registry: docker.io
-          repository: rabbitmq
-          tag: 3.10.2-management
-        properties:
-          pullPolicy:
-            default: IfNotPresent
-            enum:
-            - Always
-            - Never
-            - IfNotPresent
-            type: string
-          registry:
-            default: docker.io
-            type: string
-          repository:
-            default: rabbitmq
-            type: string
-          tag:
-            default: 3.10.2-management
-            type: string
-        type: object
-    type: object
+    - 8Gi
+    type: string
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
  ressources:
    default:
      limits:
@@ -86,16 +57,45 @@ options:
            type: string
        type: object
    type: object
-  storage:
-    default: 8Gi
+  images:
+    default:
+      rabbit:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: rabbitmq
+        tag: 3.10.2-management
    examples:
-    - 8Gi
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
+    - rabbit:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: rabbitmq
+        tag: 3.10.2-management
+    properties:
+      rabbit:
+        default:
+          pullPolicy: IfNotPresent
+          registry: docker.io
+          repository: rabbitmq
+          tag: 3.10.2-management
+        properties:
+          pullPolicy:
+            default: IfNotPresent
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+          registry:
+            default: docker.io
+            type: string
+          repository:
+            default: rabbitmq
+            type: string
+          tag:
+            default: 3.10.2-management
+            type: string
+        type: object
+    type: object
 dependencies:
 - dist: null
  category: dbo
@@ -107,4 +107,5 @@ providers:
  postgresql: null
  restapi: null
  http: null
+  gitea: null
 tfaddtype: null
--- a/share/dataset-redis/index.yaml
+++ b/share/dataset-redis/index.yaml
@@ -6,49 +6,38 @@ metadata:
  name: dataset-redis
  description: null
 options:
-  storage:
-    default: 8Gi
+  exporter:
+    default:
+      enable: true
    examples:
-    - 8Gi
-    type: string
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
  images:
    default:
-      exporter:
-        registry: quay.io
-        repository: opstree/redis-exporter
-        tag: v1.44.0
      redis:
        pullPolicy: IfNotPresent
        registry: quay.io
        repository: opstree/redis
        tag: v7.0.12
+      redis_exporter:
+        registry: quay.io
+        repository: opstree/redis-exporter
+        tag: v1.44.0
    examples:
-    - exporter:
-        registry: quay.io
-        repository: opstree/redis-exporter
-        tag: v1.44.0
-      redis:
+    - redis:
        pullPolicy: IfNotPresent
        registry: quay.io
        repository: opstree/redis
        tag: v7.0.12
+      redis_exporter:
+        registry: quay.io
+        repository: opstree/redis-exporter
+        tag: v1.44.0
    properties:
-      exporter:
-        default:
-          registry: quay.io
-          repository: opstree/redis-exporter
-          tag: v1.44.0
-        properties:
-          registry:
-            default: quay.io
-            type: string
-          repository:
-            default: opstree/redis-exporter
-            type: string
-          tag:
-            default: v1.44.0
-            type: string
-        type: object
      redis:
        default:
          pullPolicy: IfNotPresent
@@ -73,17 +62,28 @@ options:
            default: v7.0.12
            type: string
        type: object
+      redis_exporter:
+        default:
+          registry: quay.io
+          repository: opstree/redis-exporter
+          tag: v1.44.0
+        properties:
+          registry:
+            default: quay.io
+            type: string
+          repository:
+            default: opstree/redis-exporter
+            type: string
+          tag:
+            default: v1.44.0
+            type: string
+        type: object
    type: object
-  exporter:
-    default:
-      enable: true
+  storage:
+    default: 8Gi
    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
+    - 8Gi
+    type: string
 dependencies:
 - dist: null
  category: dbo
--- a/share/dataset-redis/redis.tf
+++ b/share/dataset-redis/redis.tf
@@ -24,7 +24,7 @@ resource "kubectl_manifest" "prj_redis" {
                storage: "${var.storage}"
      redisExporter:
        enabled: ${var.exporter.enable}
-        image: "${var.images.exporter.registry}/${var.images.exporter.repository}:${var.images.exporter.tag}"
+        image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"
      securityContext:
        runAsUser: 1000
        fsGroup: 1000
--- a/share/division/index.yaml
+++ b/share/division/index.yaml
@@ -6,6 +6,11 @@ metadata:
  name: division
  description: null
 options:
+  apps:
+    default: []
+    items:
+      type: string
+    type: array
  teams:
    default: []
    items:
@@ -20,11 +25,6 @@ options:
          type: string
      type: object
    type: array
-  apps:
-    default: []
-    items:
-      type: string
-    type: array
  parent:
    default: employes
    enum:
--- a/share/dns/config.tf
+++ b/share/dns/config.tf
@@ -23,13 +23,13 @@ locals {
    }
  EOF
  soa-ns = <<-EOF
-    @           IN  SOA  ${var.sub_domain}.${var.domain_name}. ${var.domain_name}. (
+    @           IN  SOA  ${var.sub-domain}.${var.domain-name}. ${var.domain-name}. (
                        ${formatdate("YYYYMMDDhh",timestamp())} ; Serial
                        4H         ; Refresh
                        1H         ; Retry
                        7D         ; Expire
                        4H )       ; Negative Cache TTL
-    @    IN NS   ${var.sub_domain}.${var.domain_name}.
+    @    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]))
--- a/share/dns/index.yaml
+++ b/share/dns/index.yaml
@@ -6,15 +6,25 @@ metadata:
  name: dns
  description: null
 options:
-  domain_name:
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  sub-domain:
+    default: dns
+    examples:
+    - dns
+    type: string
+  domain-name:
    default: your_company.com
    examples:
    - your_company.com
    type: string
-  sub_domain:
-    default: dns
+  forward:
+    default: 192.168.1.254
    examples:
-    - dns
+    - 192.168.1.254
    type: string
  zones:
    default: []
@@ -93,16 +103,6 @@ options:
        default: 1.11.1
        type: string
    type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  forward:
-    default: 192.168.1.254
-    examples:
-    - 192.168.1.254
-    type: string
 dependencies: []
 providers:
  kubernetes: true
--- a/share/organisation/gitea-user.tf
+++ b/share/organisation/gitea-user.tf
@@ -83,7 +83,7 @@ resource "gitea_user" "user-ci" {
  username             = "${var.instance}-ci"
  login_name           = "${var.instance}-ci"
  password             = random_password.password.result
-  email                = "${var.instance}-ci@${var.domain_name}"
+  email                = "${var.instance}-ci@${var.domain-name}"
  must_change_password = true
 }

--- a/share/organisation/index.yaml
+++ b/share/organisation/index.yaml
@@ -6,18 +6,31 @@ metadata:
  name: organisation
  description: null
 options:
-  datasets:
-    default: []
-    items:
-      properties:
-        engine:
-          default: pg
-          type: string
-        name:
-          default: ''
-          type: string
-      type: object
-    type: array
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  gitea-ssh-domain:
+    default: ''
+    examples:
+    - ''
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
  stages:
    default: []
    items:
@@ -27,36 +40,6 @@ options:
          type: string
      type: object
    type: array
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  haveGitea:
-    default: false
-    examples:
-    - false
-    type: boolean
-  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
  backups:
    default:
      enable: false
@@ -87,26 +70,43 @@ options:
        default: backup-settings
        type: string
    type: object
-  app_group:
-    default: dev
+  haveGitea:
+    default: false
    examples:
-    - dev
-    type: string
-  domain_name:
+    - false
+    type: boolean
+  datasets:
+    default: []
+    items:
+      properties:
+        engine:
+          default: pg
+          type: string
+        name:
+          default: ''
+          type: string
+      type: object
+    type: array
+  domain-name:
    default: your_company.com
    examples:
    - your_company.com
    type: string
-  domain:
-    default: your-company
+  distributions:
+    default:
+      core: core
+      domain: domain
    examples:
-    - your-company
-    type: string
-  gitea-ssh-domain:
-    default: ''
-    examples:
-    - ''
-    type: string
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
 dependencies: []
 providers:
  kubernetes: true
--- a/share/organisation/stages.tf
+++ b/share/organisation/stages.tf
@@ -1,17 +1,17 @@
 locals {
  annotations = {
    "vynil.solidite.fr/name" = "${var.component}"
-    "vynil.solidite.fr/domain" = var.domain_name
+    "vynil.solidite.fr/domain" = var.domain-name
    "vynil.solidite.fr/issuer" = var.issuer
-    "vynil.solidite.fr/ingress" = var.ingress_class
+    "vynil.solidite.fr/ingress" = var.ingress-class
  }
  global = {
    "domain"         = var.namespace
-    "domain_name"    = var.domain_name
+    "domain-name"    = var.domain-name
    "issuer"         = var.issuer
-    "ingress_class"  = var.ingress_class
+    "ingress-class"  = var.ingress-class
    "backups"        = var.backups
-    "app_group"      = var.app_group
+    "app-group"      = var.app-group
  }
  sorted-stage-name = reverse(distinct(sort([for s in var.stages: s.name])))
  sorted-dataset-name = reverse(distinct(sort([for d in var.datasets: d.name])))
@@ -26,7 +26,7 @@ locals {
      for name in local.sorted-dataset-name: [
        for ds in var.datasets:
          merge(ds,{
-            "sub_domain" = "${stage}.${var.instance}"
+            "sub-domain" = "${stage}.${var.instance}"
            "namespace" = "${var.domain}-${var.instance}-${stage}"
          }) if ds.name == name
      ]
--- a/share/wildduck/application.tf
+++ b/share/wildduck/application.tf
@@ -14,10 +14,10 @@ resource "authentik_application" "prj_app" {
  name              = "${var.instance}"
  slug              = "${var.component}-${var.instance}"
  #protocol_provider = authentik_provider_oauth2.oauth2.id
-  group             = var.app_group
+  group             = var.app-group
  backchannel_providers = [authentik_provider_scim.scim.id]
-  meta_launch_url   = format("https://%s.%s", var.sub_domain, var.domain_name)
-  meta_icon         = format("https://%s.%s/%s", var.sub_domain, var.domain_name, "favicon-32x32.png")
+  meta_launch_url   = format("https://%s.%s", var.sub-domain, var.domain-name)
+  meta_icon         = format("https://%s.%s/%s", var.sub-domain, var.domain-name, "favicon-32x32.png")
 }

 resource "authentik_policy_expression" "policy" {
--- a/share/wildduck/haraka.tf
+++ b/share/wildduck/haraka.tf
@@ -96,11 +96,11 @@ resource "kubernetes_config_map_v1" "haraka_config" {
  }
  data = yamldecode(<<-EOF
      me: |-
-        ${var.sub_domain}.${var.domain_name}
+        ${var.sub-domain}.${var.domain-name}
      host_list: |-
        # add hosts in here we want to accept mail for
-        ${var.sub_domain}.${var.domain_name}
-        ${var.domain_name}
+        ${var.sub-domain}.${var.domain-name}
+        ${var.domain-name}
        ${join("\n        ",var.additional-domains)}
      rspamd.ini: |-
        host = ${var.instance}-rspamd.${var.namespace}.svc.cluster.local
@@ -188,7 +188,7 @@ resource "kubernetes_config_map_v1" "haraka_config" {
      dkim_sign.ini: |-
        disabled = true
        selector = mail
-        domain = ${var.domain_name}
+        domain = ${var.domain-name}
        headers_to_sign = From, Sender, Reply-To, Subject, Date, Message-ID, To, Cc, MIME-Version
      wildduck.yaml: |-
        redis:
--- a/share/wildduck/index.yaml
+++ b/share/wildduck/index.yaml
@@ -6,11 +6,83 @@ metadata:
  name: wildduck
  description: null
 options:
-  app_group:
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  redis:
+    default:
+      exporter:
+        enabled: true
+    examples:
+    - exporter:
+        enabled: true
+    properties:
+      exporter:
+        default:
+          enabled: true
+        properties:
+          enabled:
+            default: true
+            type: boolean
+        type: object
+    type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  app-group:
    default: ''
    examples:
    - ''
    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  sub-domain:
+    default: mail
+    examples:
+    - mail
+    type: string
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    examples:
+    - enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key-id-key:
+        default: s3-id
+        type: string
+      secret-key:
+        default: s3-secret
+        type: string
+      secret-name:
+        default: backup-settings
+        type: string
+    type: object
+  additional-domains:
+    default: []
+    items:
+      type: string
+    type: array
  images:
    default:
      haraka:
@@ -288,38 +360,11 @@ options:
            type: string
        type: object
    type: object
-  sub_domain:
-    default: mail
+  ingress-class:
+    default: traefik
    examples:
-    - mail
+    - traefik
    type: string
-  additional-domains:
-    default: []
-    items:
-      type: string
-    type: array
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  redis:
-    default:
-      exporter:
-        enabled: true
-    examples:
-    - exporter:
-        enabled: true
-    properties:
-      exporter:
-        default:
-          enabled: true
-        properties:
-          enabled:
-            default: true
-            type: boolean
-        type: object
-    type: object
  storage:
    default:
      redis:
@@ -337,51 +382,6 @@ options:
            type: string
        type: object
    type: object
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
-    examples:
-    - enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key-id-key:
-        default: s3-id
-        type: string
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
-        type: string
-    type: object
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
 dependencies:
 - dist: null
  category: dbo
--- a/share/wildduck/ingress.tf
+++ b/share/wildduck/ingress.tf
@@ -1,6 +1,6 @@
 locals {
-    dns_names = ["${var.sub_domain}.${var.domain_name}"]
-    cert-names = concat(local.dns_names, ["${var.domain_name}"])
+    dns_names = ["${var.sub-domain}.${var.domain-name}"]
+    cert-names = concat(local.dns_names, ["${var.domain-name}"])
    middlewares = ["${var.instance}-https"]
    service = {
      "name"  = "${var.instance}-webmail"
@@ -67,7 +67,7 @@ resource "kubectl_manifest" "prj_ingress" {
      annotations:
        "traefik.ingress.kubernetes.io/router.middlewares": "${join(",", [for m in local.middlewares : format("%s-%s@kubernetescrd", var.namespace, m)])}"
    spec:
-      ingressClassName: "${var.ingress_class}"
+      ingressClassName: "${var.ingress-class}"
      rules: ${jsonencode(local.rules)}
      tls:
      - hosts: ${jsonencode(local.dns_names)}
--- a/share/wildduck/scimgateway.tf
+++ b/share/wildduck/scimgateway.tf
@@ -55,7 +55,7 @@ resource "kubectl_manifest" "scimgateway_deploy" {
            - name: "PORT"
              value: "8880"
            - name: "WILDDUCK_DOMAIN"
-              value: "${var.domain_name}"
+              value: "${var.domain-name}"
            - name: "WILDDUCK_API"
              value: "http://${var.instance}-wildduck-api.${var.namespace}.svc"
            - name: SEED
--- a/share/wildduck/webmail.tf
+++ b/share/wildduck/webmail.tf
@@ -92,7 +92,7 @@ resource "kubernetes_config_map_v1" "webmail_config" {

        [service]
            # email domain for new users
-            domain="${var.domain_name}"
+            domain="${var.domain-name}"
            # default quotas for new users
            quota=1024
            recipients=2000
@@ -102,7 +102,7 @@ resource "kubernetes_config_map_v1" "webmail_config" {
            allowJoin=false
            enableSpecial=false # if true the allow creating addresses with special usernames
            # allowed domains for new addresses
-            domains=["${var.domain_name}"]
+            domains=["${var.domain-name}"]

            generalNotification="" # static notification to show on top of the page

@@ -145,7 +145,7 @@ resource "kubernetes_config_map_v1" "webmail_config" {
            # set to false if not using HTTPS
            enabled=true
            # must be https url or use default
-            appId="https://${var.domain_name}"
+            appId="https://${var.domain-name}"

        [log]
            level="silly"
@@ -154,15 +154,15 @@ resource "kubernetes_config_map_v1" "webmail_config" {
        [setup]
            # these values are shown in the configuration help page
            [setup.imap]
-                hostname="${var.sub_domain}.${var.domain_name}"
+                hostname="${var.sub-domain}.${var.domain-name}"
                secure=true
                port=143
            [setup.pop3]
-                hostname="${var.sub_domain}.${var.domain_name}"
+                hostname="${var.sub-domain}.${var.domain-name}"
                secure=true
                port=110
            [setup.smtp]
-                hostname="${var.sub_domain}.${var.domain_name}"
+                hostname="${var.sub-domain}.${var.domain-name}"
                secure=true
                port=25
  EOF
--- a/share/wildduck/wildduck.tf
+++ b/share/wildduck/wildduck.tf
@@ -173,7 +173,7 @@ resource "kubernetes_config_map_v1" "wildduck_config" {
        enabled=true
        [smtp.setup]
        # Public configuration for SMTP MDA, needed for mobileconfig files
-        hostname="${var.sub_domain}.${var.domain_name}"
+        hostname="${var.sub-domain}.${var.domain-name}"
        secure=true
        port=465
        [webhooks]
@@ -312,7 +312,7 @@ resource "kubernetes_config_map_v1" "wildduck_config" {
        autoExpunge=true
        [setup]
        # Public configuration for IMAP
-        hostname="${var.sub_domain}.${var.domain_name}"
+        hostname="${var.sub-domain}.${var.domain-name}"
        secure=true
        # port defaults to imap.port
        port=9930
@@ -360,7 +360,7 @@ resource "kubernetes_config_map_v1" "wildduck_config" {
        cert="/var/opt/certs/tls.crt"
        [setup]
        # Public configuration for POP3
-        hostname="${var.sub_domain}.${var.domain_name}"
+        hostname="${var.sub-domain}.${var.domain-name}"
        secure=true
        # port defaults to pop3.port
        port=995
--- a/share/wildduck/zonemta.tf
+++ b/share/wildduck/zonemta.tf
@@ -128,7 +128,7 @@ resource "kubernetes_config_map_v1" "zonemta_config" {
        # Server process must be able to locally bind to these addresses
        [[default]]
        address="0.0.0.0"
-        name="${var.sub_domain}.${var.domain_name}"
+        name="${var.sub-domain}.${var.domain-name}"
        #
        #[[default]]
        #address="1.2.3.5"
@@ -145,7 +145,7 @@ resource "kubernetes_config_map_v1" "zonemta_config" {
        interfaces=["feeder"]
        # optional hostname to be used in headers
        # defaults to os.hostname()
-        hostname="${var.sub_domain}.${var.domain_name}"
+        hostname="${var.sub-domain}.${var.domain-name}"
        # How long to keep auth records in log
        authlogExpireDays=30
        # default smtp recipients for 24h (can be overriden per user)
@@ -161,7 +161,7 @@ resource "kubernetes_config_map_v1" "zonemta_config" {
            # SRS secret value. Must be the same as in the MX side
            secret="${local.secrets.srs}"
            # SRS domain, must resolve back to MX
-            rewriteDomain="${var.domain_name}"
+            rewriteDomain="${var.domain-name}"
        # DKIM Settings
        # -------------
        ["modules/zonemta-wildduck".dkim]