From 9ce3a15fca04fb1babde30bdf5f9c0467269e395 Mon Sep 17 00:00:00 2001
From: Markus Schmidl <markus.schmidl@mailbox.tu-dresden.de>
Date: Sat, 9 Jul 2022 23:09:53 +0200
Subject: [PATCH] upstream4: add port forwarding for data-hoarder and add
 data-hoarder

---
 config/net/serv.nix     |  2 ++
 config/net/upstream.nix | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/config/net/serv.nix b/config/net/serv.nix
index 91efaeb..c8bae13 100644
--- a/config/net/serv.nix
+++ b/config/net/serv.nix
@@ -72,6 +72,7 @@
       hedgedoc = "172.20.73.66";
       mediawiki = "172.20.73.67";
       gnunet = "172.20.73.68";
+      data-hoarder = "172.20.73.69";
     };
     subnets6.dn42 = "fd23:42:c3d2:582::/64";
     subnets6.up4 = "2a00:8180:2c00:282::/64";
@@ -142,6 +143,7 @@
       hedgedoc = "2a00:8180:2c00:282::6";
       mediawiki = "2a00:8180:2c00:282::43";
       gnunet = "2a00:8180:2c00:282::44";
+      data-hoader = "2a00:8180:2c00:282::45";
     };
   };
 
diff --git a/config/net/upstream.nix b/config/net/upstream.nix
index 5aa17a3..6022be0 100644
--- a/config/net/upstream.nix
+++ b/config/net/upstream.nix
@@ -260,6 +260,31 @@ in
           reflect = true;
           sourcePort = 2086;
         }
+        # data-hoarder
+        {
+          destination = servHost.data-hoarder;
+          proto = "udp";
+          reflect = true;
+          sourcePort = 51820;
+        }
+        {
+          destination = servHost.data-hoarder;
+          proto = "tcp";
+          reflect = true;
+          sourcePort = 51820;
+        }
+        {
+          destination = "${servHost.data-hoarder}:22";
+          proto = "udp";
+          reflect = false;
+          sourcePort = 2269;
+        }
+        {
+          destination = "${servHost.data-hoarder}:22";
+          proto = "tcp";
+          reflect = false;
+          sourcePort = 2269;
+        }
       ];
       interfaces = {
         core = {