From 666e8e44391574a6becda895e90ab336b768cd18 Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Tue, 27 Sep 2022 20:06:07 +0200
Subject: [PATCH] upstream.nix: remove superfluous forwards to data-hoarder and
 add forward 51821/udp to data-hoarder-staging

---
 config/net/upstream.nix | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/config/net/upstream.nix b/config/net/upstream.nix
index 921b3ac..0a64d1b 100644
--- a/config/net/upstream.nix
+++ b/config/net/upstream.nix
@@ -286,23 +286,18 @@ in
           reflect = true;
           sourcePort = 51820;
         }
-        {
-          destination = servHosts.data-hoarder;
-          proto = "tcp";
-          reflect = true;
-          sourcePort = 51820;
-        }
         {
           destination = "${servHosts.data-hoarder}:22";
+          proto = "tcp";
+          reflect = false;
+          sourcePort = 2269;
+        }
+        # data-hoarder-staging
+        {
+          destination = "${servHosts.staging-data-hoarder}:51820";
           proto = "udp";
-          reflect = false;
-          sourcePort = 2269;
-        }
-        {
-          destination = "${servHosts.data-hoarder}:22";
-          proto = "tcp";
-          reflect = false;
-          sourcePort = 2269;
+          reflect = true;
+          sourcePort = 51821;
         }
         {
           destination = "${servHosts.ftp}:22";