From 9621d7de8c3c523f0a8cceb0679a1acd3a3e0d25 Mon Sep 17 00:00:00 2001
From: Kevin Kandlbinder <kevin@kevink.dev>
Date: Mon, 24 Apr 2023 14:27:11 +0200
Subject: [PATCH] Update relay configuration

---
 nixos/amon/configuration.nix | 45 +++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/nixos/amon/configuration.nix b/nixos/amon/configuration.nix
index 4d3cc7b..df9ff78 100644
--- a/nixos/amon/configuration.nix
+++ b/nixos/amon/configuration.nix
@@ -195,27 +195,40 @@
     }
   }
   
-  target.remote relay_delivery {
-    limits {
-      destination rate 20 1s
-      destination concurrency 10
-    }
-    mx_auth {
-      dane
-      mtasts {
-        cache fs
-        fs_dir mtasts_cache/
-      }
-      local_policy {
-          min_tls_level encrypted
-          min_mx_level none
-      }
-    }
+  #target.remote relay_delivery {
+  #  limits {
+  #    destination rate 20 1s
+  #    destination concurrency 10
+  #  }
+  #  mx_auth {
+  #    dane
+  #    mtasts {
+  #      cache fs
+  #      fs_dir mtasts_cache/
+  #    }
+  #    local_policy {
+  #        min_tls_level encrypted
+  #        min_mx_level none
+  #    }
+  #  }
+  #}
+
+  target.smtp relay_delivery {
+    debug no
+    attempt_starttls yes
+    require_tls no
+    auth off
+    targets tcp://mailcow.1in9.net:25
+    connect_timeout 5m
+    command_timeout 5m
+    submission_timeout 12m
   }
   
   target.queue relay_queue {
     target &relay_delivery
+    #target smtp tcp://10.0.0.7:25
     autogenerated_msg_domain $(primary_domain)
+    max_tries 40
     bounce {
       destination postmaster $(local_domains) {
         deliver_to &local_routing