mailu: prefer postmark smtp token for relay

This commit is contained in:
Brad Stein 2026-01-20 01:04:04 -03:00
parent a86d68ca74
commit a8be46b422

View File

@ -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: