From a8be46b422fb42e9696d4147928e54f8cb97df6b Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Tue, 20 Jan 2026 01:04:04 -0300 Subject: [PATCH] mailu: prefer postmark smtp token for relay --- services/mailu/helmrelease.yaml | 78 ++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/services/mailu/helmrelease.yaml b/services/mailu/helmrelease.yaml index 9779aed..4621a2d 100644 --- a/services/mailu/helmrelease.yaml +++ b/services/mailu/helmrelease.yaml @@ -335,13 +335,14 @@ spec: export INITIAL_ADMIN_PW="{{ .Data.data.password }}" {{ end }} {{ with secret "kv/data/atlas/shared/postmark-relay" }} - {{- $apikey := index .Data.data "apikey" -}} - {{- if $apikey }} - export RELAYUSER="{{ $apikey }}" - export RELAYPASSWORD="{{ $apikey }}" + {{- $access := index .Data.data "accesskey" -}} + {{- $secret := index .Data.data "secretkey" -}} + {{- if and $access $secret }} + export RELAYUSER="{{ $access }}" + export RELAYPASSWORD="{{ $secret }}" {{- else }} - export RELAYUSER="{{ index .Data.data "accesskey" }}" - export RELAYPASSWORD="{{ index .Data.data "secretkey" }}" + export RELAYUSER="{{ index .Data.data "apikey" }}" + export RELAYPASSWORD="{{ index .Data.data "apikey" }}" {{- end }} {{ end }} spec: @@ -403,13 +404,14 @@ spec: export INITIAL_ADMIN_PW="{{ .Data.data.password }}" {{ end }} {{ with secret "kv/data/atlas/shared/postmark-relay" }} - {{- $apikey := index .Data.data "apikey" -}} - {{- if $apikey }} - export RELAYUSER="{{ $apikey }}" - export RELAYPASSWORD="{{ $apikey }}" + {{- $access := index .Data.data "accesskey" -}} + {{- $secret := index .Data.data "secretkey" -}} + {{- if and $access $secret }} + export RELAYUSER="{{ $access }}" + export RELAYPASSWORD="{{ $secret }}" {{- else }} - export RELAYUSER="{{ index .Data.data "accesskey" }}" - export RELAYPASSWORD="{{ index .Data.data "secretkey" }}" + export RELAYUSER="{{ index .Data.data "apikey" }}" + export RELAYPASSWORD="{{ index .Data.data "apikey" }}" {{- end }} {{ end }} spec: @@ -471,13 +473,14 @@ spec: export INITIAL_ADMIN_PW="{{ .Data.data.password }}" {{ end }} {{ with secret "kv/data/atlas/shared/postmark-relay" }} - {{- $apikey := index .Data.data "apikey" -}} - {{- if $apikey }} - export RELAYUSER="{{ $apikey }}" - export RELAYPASSWORD="{{ $apikey }}" + {{- $access := index .Data.data "accesskey" -}} + {{- $secret := index .Data.data "secretkey" -}} + {{- if and $access $secret }} + export RELAYUSER="{{ $access }}" + export RELAYPASSWORD="{{ $secret }}" {{- else }} - export RELAYUSER="{{ index .Data.data "accesskey" }}" - export RELAYPASSWORD="{{ index .Data.data "secretkey" }}" + export RELAYUSER="{{ index .Data.data "apikey" }}" + export RELAYPASSWORD="{{ index .Data.data "apikey" }}" {{- end }} {{ end }} spec: @@ -539,13 +542,14 @@ spec: export INITIAL_ADMIN_PW="{{ .Data.data.password }}" {{ end }} {{ with secret "kv/data/atlas/shared/postmark-relay" }} - {{- $apikey := index .Data.data "apikey" -}} - {{- if $apikey }} - export RELAYUSER="{{ $apikey }}" - export RELAYPASSWORD="{{ $apikey }}" + {{- $access := index .Data.data "accesskey" -}} + {{- $secret := index .Data.data "secretkey" -}} + {{- if and $access $secret }} + export RELAYUSER="{{ $access }}" + export RELAYPASSWORD="{{ $secret }}" {{- else }} - export RELAYUSER="{{ index .Data.data "accesskey" }}" - export RELAYPASSWORD="{{ index .Data.data "secretkey" }}" + export RELAYUSER="{{ index .Data.data "apikey" }}" + export RELAYPASSWORD="{{ index .Data.data "apikey" }}" {{- end }} {{ end }} spec: @@ -607,13 +611,14 @@ spec: export INITIAL_ADMIN_PW="{{ .Data.data.password }}" {{ end }} {{ with secret "kv/data/atlas/shared/postmark-relay" }} - {{- $apikey := index .Data.data "apikey" -}} - {{- if $apikey }} - export RELAYUSER="{{ $apikey }}" - export RELAYPASSWORD="{{ $apikey }}" + {{- $access := index .Data.data "accesskey" -}} + {{- $secret := index .Data.data "secretkey" -}} + {{- if and $access $secret }} + export RELAYUSER="{{ $access }}" + export RELAYPASSWORD="{{ $secret }}" {{- else }} - export RELAYUSER="{{ index .Data.data "accesskey" }}" - export RELAYPASSWORD="{{ index .Data.data "secretkey" }}" + export RELAYUSER="{{ index .Data.data "apikey" }}" + export RELAYPASSWORD="{{ index .Data.data "apikey" }}" {{- end }} {{ end }} spec: @@ -675,13 +680,14 @@ spec: export INITIAL_ADMIN_PW="{{ .Data.data.password }}" {{ end }} {{ with secret "kv/data/atlas/shared/postmark-relay" }} - {{- $apikey := index .Data.data "apikey" -}} - {{- if $apikey }} - export RELAYUSER="{{ $apikey }}" - export RELAYPASSWORD="{{ $apikey }}" + {{- $access := index .Data.data "accesskey" -}} + {{- $secret := index .Data.data "secretkey" -}} + {{- if and $access $secret }} + export RELAYUSER="{{ $access }}" + export RELAYPASSWORD="{{ $secret }}" {{- else }} - export RELAYUSER="{{ index .Data.data "accesskey" }}" - export RELAYPASSWORD="{{ index .Data.data "secretkey" }}" + export RELAYUSER="{{ index .Data.data "apikey" }}" + export RELAYPASSWORD="{{ index .Data.data "apikey" }}" {{- end }} {{ end }} spec: