From e290f164ddca2355ec97afe2eeb7989b9e1976d0 Mon Sep 17 00:00:00 2001
From: jzunigax2 <125698953+jzunigax2@users.noreply.github.com>
Date: Tue, 23 Jun 2026 10:50:15 -0600
Subject: [PATCH 1/2] refactor: update stalwart configuration SMTP settings

---
 deploy/charts/mail-server/templates/deployment.yaml | 8 ++++----
 deploy/charts/mail-server/values.yaml               | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deploy/charts/mail-server/templates/deployment.yaml b/deploy/charts/mail-server/templates/deployment.yaml
index a957815..3abd0b3 100644
--- a/deploy/charts/mail-server/templates/deployment.yaml
+++ b/deploy/charts/mail-server/templates/deployment.yaml
@@ -45,10 +45,10 @@ spec:
               value: {{ .Values.stalwart.jmapUrl | quote }}
             - name: STALWART_ADMIN_URL
               value: {{ .Values.stalwart.adminUrl | quote }}
-            - name: STALWART_ADMIN_USER
-              value: {{ .Values.stalwart.adminUser | quote }}
-            - name: STALWART_MASTER_USER
-              value: {{ .Values.stalwart.masterUser | quote }}
+            - name: STALWART_SMTP_HOST
+              value: {{ .Values.stalwart.smtpHost | quote }}
+            - name: STALWART_SMTP_PORT
+              value: {{ .Values.stalwart.smtpPort | quote }}
             - name: PAYMENTS_API_URL
               value: {{ .Values.paymentsApiUrl | quote }}
             - name: REDIS_URL
diff --git a/deploy/charts/mail-server/values.yaml b/deploy/charts/mail-server/values.yaml
index 87a3e62..83f68c6 100644
--- a/deploy/charts/mail-server/values.yaml
+++ b/deploy/charts/mail-server/values.yaml
@@ -34,8 +34,8 @@ database:
 stalwart:
   jmapUrl: http://stalwart:8080
   adminUrl: http://stalwart:8080
-  adminUser: mail-server
-  masterUser: master
+  smtpHost: stalwart
+  smtpPort: 465
 
 mta:
   hooksUsername: stalwart

From 6809ece3dad30378c29cc3cc8852a2441b771923 Mon Sep 17 00:00:00 2001
From: jzunigax2 <125698953+jzunigax2@users.noreply.github.com>
Date: Thu, 25 Jun 2026 10:59:16 -0600
Subject: [PATCH 2/2] feat: update chart values

---
 deploy/charts/mail-server/templates/deployment.yaml | 4 ++++
 deploy/charts/mail-server/values.yaml               | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/deploy/charts/mail-server/templates/deployment.yaml b/deploy/charts/mail-server/templates/deployment.yaml
index 3abd0b3..aeb1840 100644
--- a/deploy/charts/mail-server/templates/deployment.yaml
+++ b/deploy/charts/mail-server/templates/deployment.yaml
@@ -51,10 +51,14 @@ spec:
               value: {{ .Values.stalwart.smtpPort | quote }}
             - name: PAYMENTS_API_URL
               value: {{ .Values.paymentsApiUrl | quote }}
+            - name: BRIDGE_API_URL
+              value: {{ .Values.bridgeApiUrl | quote }}
             - name: REDIS_URL
               value: {{ .Values.redisUrl | quote }}
             - name: MTA_HOOKS_USERNAME
               value: {{ .Values.mta.hooksUsername | quote }}
+            - name: STALWART_WEBHOOK_USERNAME
+              value: {{ .Values.webhook.username | quote }}
 
           envFrom:
             - secretRef:
diff --git a/deploy/charts/mail-server/values.yaml b/deploy/charts/mail-server/values.yaml
index 83f68c6..00f3d01 100644
--- a/deploy/charts/mail-server/values.yaml
+++ b/deploy/charts/mail-server/values.yaml
@@ -23,6 +23,8 @@ nodeEnv: production
 
 paymentsApiUrl: 'https://gateway.internxt.com/payments'
 
+bridgeApiUrl: https://gateway.internxt.com/network
+
 redisUrl: REPLACE_ME
 
 database:
@@ -38,7 +40,10 @@ stalwart:
   smtpPort: 465
 
 mta:
-  hooksUsername: stalwart
+  hooksUsername: REPLACE_ME
+
+webhook:
+  username: REPLACE_ME
 
 secretName: mail-server-secrets