From 640104a958244d408ab6c77adabf647edcca42c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Fri, 11 Aug 2023 17:41:13 +0200
Subject: [PATCH] fix

---
 share/wildduck/haraka.tf   |  9 ++++
 share/wildduck/index.yaml  | 98 +++++++++++++++++++-------------------
 share/wildduck/webmail.tf  |  4 +-
 share/wildduck/wildduck.tf |  4 +-
 4 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/share/wildduck/haraka.tf b/share/wildduck/haraka.tf
index 1a9cf94..23da30d 100644
--- a/share/wildduck/haraka.tf
+++ b/share/wildduck/haraka.tf
@@ -62,10 +62,19 @@ resource "kubectl_manifest" "haraka_deploy" {
             - name: config
               mountPath: /app/config/wildduck.yaml
               subPath: wildduck.yaml
+            - name: tls
+              mountPath: /app/config/tls_key.pem
+              subPath: tls.key
+            - name: tls
+              mountPath: /app/config/tls_cert.pem
+              subPath: tls.crt
           volumes:
           - name: config
             configMap:
               name: "${var.instance}-haraka"
+          - name: tls
+            secret:
+              secretName: "${var.instance}-cert"
   EOF
 }
 
diff --git a/share/wildduck/index.yaml b/share/wildduck/index.yaml
index 5ece657..c098174 100644
--- a/share/wildduck/index.yaml
+++ b/share/wildduck/index.yaml
@@ -6,21 +6,59 @@ metadata:
   name: wildduck
   description: null
 options:
-  sub-domain:
-    default: mail
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - mail
+    - letsencrypt-prod
     type: string
   additional-domains:
     default: []
     items:
       type: string
     type: array
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
+  redis:
+    default:
+      exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
+    examples:
+    - exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
+    properties:
+      exporter:
+        default:
+          enabled: true
+          image: quay.io/opstree/redis-exporter:v1.44.0
+        properties:
+          enabled:
+            default: true
+            type: boolean
+          image:
+            default: quay.io/opstree/redis-exporter:v1.44.0
+            type: string
+        type: object
+      image:
+        default: quay.io/opstree/redis:v7.0.5
+        type: string
+      storage:
+        default: 2Gi
+        type: string
+    type: object
   backups:
     default:
       enable: false
@@ -51,6 +89,11 @@ options:
         default: backup-settings
         type: string
     type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   images:
     default:
       haraka:
@@ -214,53 +257,10 @@ options:
             type: string
         type: object
     type: object
-  domain:
-    default: your-company
+  sub-domain:
+    default: mail
     examples:
-    - your-company
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  redis:
-    default:
-      exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
-    examples:
-    - exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
-    properties:
-      exporter:
-        default:
-          enabled: true
-          image: quay.io/opstree/redis-exporter:v1.44.0
-        properties:
-          enabled:
-            default: true
-            type: boolean
-          image:
-            default: quay.io/opstree/redis-exporter:v1.44.0
-            type: string
-        type: object
-      image:
-        default: quay.io/opstree/redis:v7.0.5
-        type: string
-      storage:
-        default: 2Gi
-        type: string
-    type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
+    - mail
     type: string
 dependencies:
 - dist: null
diff --git a/share/wildduck/webmail.tf b/share/wildduck/webmail.tf
index 93babd9..9b1cae0 100644
--- a/share/wildduck/webmail.tf
+++ b/share/wildduck/webmail.tf
@@ -37,7 +37,7 @@ resource "kubectl_manifest" "webmail_deploy" {
             - "--config=./config/webmail.toml"
             ports:
             - name: http
-              containerPort: 80
+              containerPort: 8000
               protocol: TCP
             livenessProbe:
               httpGet:
@@ -111,7 +111,7 @@ resource "kubectl_manifest" "webmail_config" {
 
         [www]
             host=false
-            port=80
+            port=8000
             proxy=false
             postsize="5MB"
             log="dev"
diff --git a/share/wildduck/wildduck.tf b/share/wildduck/wildduck.tf
index 91267c4..d2be044 100644
--- a/share/wildduck/wildduck.tf
+++ b/share/wildduck/wildduck.tf
@@ -91,8 +91,8 @@ resource "kubectl_manifest" "wildduck_deploy" {
             configMap:
               name: "${var.instance}-wildduck"
           - name: tls
-          secret:
-            secretName: "${var.instance}-cert"
+            secret:
+              secretName: "${var.instance}-cert"
   EOF
 }