From 76fafed977ff9cba452fcc8e0859927206a8cfba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 11 Aug 2023 15:35:07 +0200 Subject: [PATCH] fix --- share/wildduck/index.yaml | 98 +++++++++++++++++++------------------- share/wildduck/rspamd.tf | 8 ++-- share/wildduck/webmail.tf | 8 ++-- share/wildduck/wildduck.tf | 24 +++++----- share/wildduck/zonemta.tf | 14 +++--- 5 files changed, 76 insertions(+), 76 deletions(-) diff --git a/share/wildduck/index.yaml b/share/wildduck/index.yaml index d4e497a..5ece657 100644 --- a/share/wildduck/index.yaml +++ b/share/wildduck/index.yaml @@ -6,16 +6,51 @@ metadata: name: wildduck description: null options: - domain-name: - default: your_company.com + sub-domain: + default: mail examples: - - your_company.com + - mail type: string - domain: - default: your-company + additional-domains: + default: [] + items: + type: string + type: array + ingress-class: + default: traefik examples: - - your-company + - traefik 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 images: default: haraka: @@ -179,51 +214,16 @@ options: type: string type: object type: object - sub-domain: - default: mail + domain: + default: your-company examples: - - mail - type: string - ingress-class: - default: traefik - examples: - - traefik + - your-company type: string issuer: default: letsencrypt-prod examples: - letsencrypt-prod 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 redis: default: exporter: @@ -257,11 +257,11 @@ options: default: 2Gi type: string type: object - additional-domains: - default: [] - items: - type: string - type: array + domain-name: + default: your_company.com + examples: + - your_company.com + type: string dependencies: - dist: null category: dbo diff --git a/share/wildduck/rspamd.tf b/share/wildduck/rspamd.tf index 03486ff..a580a39 100644 --- a/share/wildduck/rspamd.tf +++ b/share/wildduck/rspamd.tf @@ -49,10 +49,10 @@ resource "kubectl_manifest" "rspamd_deploy" { - name: config mountPath: /etc/rspamd/override.d/redis.conf subPath: redis.conf - volumes: - - name: config - configMap: - name: "${var.instance}-rspamd" + volumes: + - name: config + configMap: + name: "${var.instance}-rspamd" EOF } diff --git a/share/wildduck/webmail.tf b/share/wildduck/webmail.tf index 5a6ca2c..93babd9 100644 --- a/share/wildduck/webmail.tf +++ b/share/wildduck/webmail.tf @@ -55,10 +55,10 @@ resource "kubectl_manifest" "webmail_deploy" { - name: config mountPath: /app/config/webmail.toml subPath: webmail.toml - volumes: - - name: config - configMap: - name: "${var.instance}-webmail" + volumes: + - name: config + configMap: + name: "${var.instance}-webmail" EOF } diff --git a/share/wildduck/wildduck.tf b/share/wildduck/wildduck.tf index 70bce64..91267c4 100644 --- a/share/wildduck/wildduck.tf +++ b/share/wildduck/wildduck.tf @@ -65,32 +65,32 @@ resource "kubectl_manifest" "wildduck_deploy" { - name: tls mountPath: "/var/opt/certs" readOnly: true - - name: config + - name: configmap mountPath: /wildduck/config/default.toml subPath: default.toml - - name: config + - name: configmap mountPath: /wildduck/config/api.toml subPath: api.toml - - name: config + - name: configmap mountPath: /wildduck/config/dbs.toml subPath: dbs.toml - - name: config + - name: configmap mountPath: /wildduck/config/dkim.toml subPath: dkim.toml - - name: config + - name: configmap mountPath: /wildduck/config/imap.toml subPath: imap.toml - - name: config + - name: configmap mountPath: /wildduck/config/pop3.toml subPath: pop3.toml - - name: config + - name: configmap mountPath: /wildduck/config/sender.toml subPath: sender.toml - volumes: - - name: config - configMap: - name: "${var.instance}-wildduck" - - name: tls + volumes: + - name: configmap + configMap: + name: "${var.instance}-wildduck" + - name: tls secret: secretName: "${var.instance}-cert" EOF diff --git a/share/wildduck/zonemta.tf b/share/wildduck/zonemta.tf index b2e4cce..5564efd 100644 --- a/share/wildduck/zonemta.tf +++ b/share/wildduck/zonemta.tf @@ -68,13 +68,13 @@ resource "kubectl_manifest" "zonemta_deploy" { - name: config mountPath: /app/config/interfaces/feeder.toml subPath: feeder.toml - volumes: - - name: config - configMap: - name: "${var.instance}-zonemta" - - name: tls - secret: - secretName: "${var.instance}-cert" + volumes: + - name: config + configMap: + name: "${var.instance}-zonemta" + - name: tls + secret: + secretName: "${var.instance}-cert" EOF }