From 6da7456ba126e61783deda5e1e546e45318dd84d Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 14 Oct 2021 17:03:49 +0200
Subject: [PATCH] lib/config/legacy: increase readability of
 upstream4.forwardPorts

---
 nix/lib/config/legacy.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nix/lib/config/legacy.nix b/nix/lib/config/legacy.nix
index 0ad0aab..ae65c7e 100644
--- a/nix/lib/config/legacy.nix
+++ b/nix/lib/config/legacy.nix
@@ -196,57 +196,57 @@ in
 
         upstream4.forwardPorts = [
           {
-            destination = "172.20.73.45:80";
+            destination = config.site.net.serv.public-access-proxy.ip4;
             proto = "tcp";
             sourcePort = 80;
           }
           {
-            destination = "172.20.73.45:443";
+            destination = config.site.net.serv.public-access-proxy.ip4;
             proto = "tcp";
             sourcePort = 443;
           }
           {
-            destination = "172.22.99.253";
+            destination = config.site.net.c3d2.dn42.ip4;
             proto = "udp";
             sourcePort = 2325;
           }
           {
-            destination = "172.22.99.253";
+            destination = config.site.net.c3d2.dn42.ip4;
             proto = "udp";
             sourcePort = 2399;
           }
           {
-            destination = "172.22.99.253";
+            destination = config.site.net.c3d2.dn42.ip4;
             proto = "udp";
             sourcePort = 2327;
           }
           {
-            destination = "172.22.99.253";
+            destination = config.site.net.c3d2.dn42.ip4;
             proto = "udp";
             sourcePort = 2338;
           }
           {
-            destination = "172.22.99.253";
+            destination = config.site.net.c3d2.dn42.ip4;
             proto = "udp";
             sourcePort = 2339;
           }
           {
-            destination = "172.22.99.253";
+            destination = config.site.net.c3d2.dn42.ip4;
             proto = "udp";
             sourcePort = 40533;
           }
           {
-            destination = "172.22.99.253";
+            destination = config.site.net.c3d2.dn42.ip4;
             proto = "udp";
             sourcePort = 61699;
           }
           {
-            destination = "172.20.73.47:22";
+            destination = "${config.site.net.serv.leonos.ip4}:22";
             proto = "tcp";
             sourcePort = 2223;
           }
           {
-            destination = "172.20.73.48:30000";
+            destination = config.site.net.serv.minetest.ip4;
             proto = "udp";
             sourcePort = 30000;
           }
@@ -256,7 +256,7 @@ in
             sourcePort = 2224;
           }
           { # Gitea ssh
-            destination = "${config.site.net.serv.hosts4.gitea}:22";
+            destination = config.site.net.serv.hosts4.gitea;
             proto = "tcp";
             sourcePort = 22;
           }