From 728b1b523b2d679b9a9d2ed1bbc9c0ca2005fe64 Mon Sep 17 00:00:00 2001
From: Tommy <tommy@rodl.no>
Date: Mon, 24 Jun 2024 18:26:43 +0200
Subject: [PATCH] fix(stalwart-mail): fix mounts

---
 charts/stalwart-mail/Chart.yaml                |  2 +-
 charts/stalwart-mail/templates/deployment.yaml | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/charts/stalwart-mail/Chart.yaml b/charts/stalwart-mail/Chart.yaml
index 038da31..40c7520 100644
--- a/charts/stalwart-mail/Chart.yaml
+++ b/charts/stalwart-mail/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: stalwart-mail
 description: Stalwart is a JMAP, IMAP4 and SMTP server
-version: 0.1.7
+version: 0.1.9
 appVersion: 0.8.1
 maintainers:
 - name: Tommy Skaug
diff --git a/charts/stalwart-mail/templates/deployment.yaml b/charts/stalwart-mail/templates/deployment.yaml
index ea6f81e..c053a10 100644
--- a/charts/stalwart-mail/templates/deployment.yaml
+++ b/charts/stalwart-mail/templates/deployment.yaml
@@ -19,7 +19,7 @@ spec:
       - name: stalwart-mail
         image: "{{ .Values.image.repository }}:v{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        command: ["sh", "-c", "cp /etc/stalwart-mail.conf /etc/stalwart-mail-rw.conf && /usr/local/bin/stalwart-mail --config /etc/stalwart-mail-rw.conf"]
+        command: ["sh", "-c", "cp /config/stalwart-mail.conf /etc/stalwart-mail-rw.conf && /usr/local/bin/stalwart-mail --config /etc/stalwart-mail-rw.conf"]
         ports:
         - containerPort: 8080
         - containerPort: 443
@@ -83,9 +83,8 @@ spec:
         volumeMounts:
         - name: stalwart-data
           mountPath: /data
-        - mountPath: /etc/stalwart-mail.conf
-          subPath: stalwart-mail.conf
-          name: stalwart-conf
+        - name: stalwart-conf
+          mountPath: /config
           readOnly: true
       volumes:
       - name: stalwart-data
@@ -93,4 +92,7 @@ spec:
           claimName: {{ include "stalwart-mail.fullname" . }}
       - name: stalwart-conf
         configMap:
-          name: {{ .Values.existingConfigMap }}
\ No newline at end of file
+          name: {{ .Values.existingConfigMap }}
+          items:
+            - key: configuration.yaml
+              path: stalwart-mail.conf
\ No newline at end of file