From 22edf9491030a7fe1802fcb9cb9a9a149fc38220 Mon Sep 17 00:00:00 2001
From: Viktor Barzin <vbarzin@gmail.com>
Date: Mon, 1 Jan 2024 22:05:13 +0000
Subject: [PATCH] revert to old settings using sasl for auth with sendgrid [ci
 skip]

---
 modules/kubernetes/mailserver/main.tf      | 1 +
 modules/kubernetes/mailserver/variables.tf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/kubernetes/mailserver/main.tf b/modules/kubernetes/mailserver/main.tf
index ea934982..e0ba40df 100644
--- a/modules/kubernetes/mailserver/main.tf
+++ b/modules/kubernetes/mailserver/main.tf
@@ -43,6 +43,7 @@ resource "kubernetes_config_map" "mailserver_env_config" {
     POSTFIX_MESSAGE_SIZE_LIMIT             = 1024 * 1024 * 200 # 200 MB
     POSTFIX_REJECT_UNKNOWN_CLIENT_HOSTNAME = "1"
     TLS_LEVEL                              = "intermediate"
+    DEFAULT_RELAY_HOST                     = "[smtp.sendgrid.net]:587"
     SPOOF_PROTECTION                       = "1"
     SSL_TYPE                               = "manual"
     SSL_CERT_PATH                          = "/tmp/ssl/tls.crt"
diff --git a/modules/kubernetes/mailserver/variables.tf b/modules/kubernetes/mailserver/variables.tf
index 618a901d..6401188f 100644
--- a/modules/kubernetes/mailserver/variables.tf
+++ b/modules/kubernetes/mailserver/variables.tf
@@ -2,13 +2,13 @@
 # see defaults - https://github.com/docker-mailserver/docker-mailserver/blob/master/target/postfix/main.cf
 variable "postfix_cf" {
   default = <<EOT
+relayhost = [smtp.sendgrid.net]:587
 smtp_sasl_auth_enable = yes
 smtp_sasl_password_maps = hash:/etc/postfix/sasl/passwd
 smtp_sasl_security_options = noanonymous
 smtp_sasl_tls_security_options = noanonymous
 smtp_tls_security_level = encrypt
 header_size_limit = 4096000
-relayhost = [smtp.sendgrid.net]:587
 EOT
 }
 variable "postfix_cf_reference_DO_NOT_USE" {