From 3ba3808ad5111584410064286cf6bb84a8a97734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Sat, 12 Aug 2023 18:27:40 +0200
Subject: [PATCH] fix

---
 share/wildduck/index.yaml | 92 +++++++++++++++++++--------------------
 share/wildduck/mongo.tf   |  2 +
 share/wildduck/zonemta.tf |  2 +-
 3 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/share/wildduck/index.yaml b/share/wildduck/index.yaml
index 0a0c086..5fd997b 100644
--- a/share/wildduck/index.yaml
+++ b/share/wildduck/index.yaml
@@ -6,41 +6,11 @@ metadata:
   name: wildduck
   description: null
 options:
-  issuer:
-    default: letsencrypt-prod
+  sub-domain:
+    default: mail
     examples:
-    - letsencrypt-prod
+    - 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
   redis:
     default:
       exporter:
@@ -79,6 +49,16 @@ options:
     items:
       type: string
     type: array
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   images:
     default:
       haraka:
@@ -242,25 +222,45 @@ options:
             type: string
         type: object
     type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  sub-domain:
-    default: mail
-    examples:
-    - mail
-    type: string
   domain-name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
-  domain:
-    default: your-company
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
     examples:
-    - your-company
+    - 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
diff --git a/share/wildduck/mongo.tf b/share/wildduck/mongo.tf
index 1150ae7..483ae6f 100644
--- a/share/wildduck/mongo.tf
+++ b/share/wildduck/mongo.tf
@@ -92,6 +92,8 @@ resource "kubectl_manifest" "prj_mongo" {
         roles:
         - db: zonemta
           name: readWrite
+        - db: ${var.component}
+          name: readWrite
         scramCredentialsSecretName: "${var.instance}-${var.component}-mongo-scram"
   EOF
 }
diff --git a/share/wildduck/zonemta.tf b/share/wildduck/zonemta.tf
index b5ac642..f7fa6aa 100644
--- a/share/wildduck/zonemta.tf
+++ b/share/wildduck/zonemta.tf
@@ -116,7 +116,7 @@ resource "kubectl_manifest" "zonemta_config" {
         # Database configuration
         # this file is loaded when NODE_ENV=production
         # MongoDB connection string
-        mongo="mongodb://${var.component}:${local.mongo-password}@${var.instance}-${var.component}-mongo-svc.${var.namespace}.svc:27017/zonemta"
+        mongo="mongodb://zonemta:${local.mongo-password}@${var.instance}-${var.component}-mongo-svc.${var.namespace}.svc:27017/zonemta"
         # 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