From f89eb6146dbabe3798bcaa36674ad798e09ccdf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 12 Apr 2024 23:38:41 +0200
Subject: [PATCH] upstream: fix mail forward

---
 config/net/upstream.nix | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/config/net/upstream.nix b/config/net/upstream.nix
index 3c84900..619821d 100644
--- a/config/net/upstream.nix
+++ b/config/net/upstream.nix
@@ -2,7 +2,7 @@
 let
   servHosts = config.site.net.serv.hosts4;
   inherit (config.site.net.c3d2.hosts4) dn42;
-  inherit (config.site.net.flpk.hosts4) c3d2-web mailtngbert;
+  inherit (config.site.net.flpk.hosts4) c3d2-web mail;
 in
 {
   site.hosts = {
@@ -152,37 +152,37 @@ in
           sourcePort = 3479;
         }
         {
-          destination = mailtngbert;
+          destination = mail;
           proto = "tcp";
           sourcePort = 25;
         }
         {
-          destination = mailtngbert;
-          proto = "tcp";
-          sourcePort = 465;
-        }
-        {
-          destination = mailtngbert;
-          proto = "tcp";
-          sourcePort = 587;
-        }
-        {
-          destination = mailtngbert;
+          destination = mail;
           proto = "tcp";
           sourcePort = 110;
         }
         {
-          destination = mailtngbert;
+          destination = mail;
           proto = "tcp";
           sourcePort = 143;
         }
         {
-          destination = mailtngbert;
+          destination = mail;
+          proto = "tcp";
+          sourcePort = 465;
+        }
+        {
+          destination = mail;
+          proto = "tcp";
+          sourcePort = 587;
+        }
+        {
+          destination = mail;
           proto = "tcp";
           sourcePort = 993;
         }
         {
-          destination = mailtngbert;
+          destination = mail;
           proto = "tcp";
           sourcePort = 995;
         }