From 372912b9bfe132dc0f3d6e1353d2f580447089a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Sun, 13 Aug 2023 07:31:07 +0200
Subject: [PATCH] fix

---
 share/wildduck/index.yaml  | 96 +++++++++++++++++++-------------------
 share/wildduck/wildduck.tf |  2 +-
 share/wildduck/zonemta.tf  |  4 +-
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/share/wildduck/index.yaml b/share/wildduck/index.yaml
index 5fd997b..a36803b 100644
--- a/share/wildduck/index.yaml
+++ b/share/wildduck/index.yaml
@@ -6,10 +6,10 @@ metadata:
   name: wildduck
   description: null
 options:
-  sub-domain:
-    default: mail
+  ingress-class:
+    default: traefik
     examples:
-    - mail
+    - traefik
     type: string
   redis:
     default:
@@ -44,11 +44,46 @@ 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
+  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
   issuer:
     default: letsencrypt-prod
     examples:
@@ -59,6 +94,11 @@ options:
     examples:
     - your-company
     type: string
+  additional-domains:
+    default: []
+    items:
+      type: string
+    type: array
   images:
     default:
       haraka:
@@ -222,46 +262,6 @@ options:
             type: string
         type: object
     type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    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
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/wildduck/wildduck.tf b/share/wildduck/wildduck.tf
index 0cab2d6..b93fa6e 100644
--- a/share/wildduck/wildduck.tf
+++ b/share/wildduck/wildduck.tf
@@ -250,7 +250,7 @@ resource "kubectl_manifest" "wildduck_config" {
 
         # Optional database name or connection url for ZoneMTA queue database. This is
         # used to push outbound emails to the sending queue
-        sender="zonemta"
+        # sender="zonemta"
 
         #queued="mail"
       dkim.toml: |-
diff --git a/share/wildduck/zonemta.tf b/share/wildduck/zonemta.tf
index f7fa6aa..9ad7e98 100644
--- a/share/wildduck/zonemta.tf
+++ b/share/wildduck/zonemta.tf
@@ -116,11 +116,11 @@ resource "kubectl_manifest" "zonemta_config" {
         # Database configuration
         # this file is loaded when NODE_ENV=production
         # MongoDB connection string
-        mongo="mongodb://zonemta:${local.mongo-password}@${var.instance}-${var.component}-mongo-svc.${var.namespace}.svc:27017/zonemta"
+        mongo="mongodb://${var.component}:${local.mongo-password}@${var.instance}-${var.component}-mongo-svc.${var.namespace}.svc:27017/${var.component}"
         # Redis connection string
         redis="redis://${var.instance}-${var.component}-redis.${var.namespace}.svc:6379/2"
         # Database name for ZoneMTA data in MongoDB. In most cases it should be the same as in the connection string
-        sender="wildduck"
+        # sender="zonemta"
         # Database name for Wild Duck users
         # users="wildduck"
         # Database name for Wild Duck attachments