diff --git a/cabling.md b/cabling.md index a656dcf..6b51ef5 100644 --- a/cabling.md +++ b/cabling.md @@ -30,7 +30,7 @@ Alle Stecker im Haus sind in Schema A gecrimpt. | ![][ri] B 4.04.01 *v* | ![][gi] B 2.05.07 *v* | | | 18 | | ![][ri] B 4.05.02 *v* | ![][gi] B 2.06 | | | 19 | | ![][ri] B 4.06.01 *v* | ![][ri] B 2.07 | | | 20 | -| ![][ri] B 4.07.05 | | | | 21 | +| ![][ri] B 4.07.05 *v* | | | | 21 | | ![][ri] B 4.08.01 | | | | 22 | | ![][ri] B 4.09.01 *v* | | | | 23 | | ![][ri] B 4.10.01 *v* | | | | 24 | diff --git a/config/net/core.nix b/config/net/core.nix index af3f4ba..586001b 100644 --- a/config/net/core.nix +++ b/config/net/core.nix @@ -52,6 +52,7 @@ priv43-gw = "172.20.72.68"; priv44-gw = "172.20.72.70"; priv45-gw = "172.20.72.72"; + priv46-gw = "172.20.72.73"; priv5-gw = "172.20.72.15"; priv6-gw = "172.20.72.16"; priv7-gw = "172.20.72.17"; @@ -122,6 +123,7 @@ priv43-gw = "fd23:42:c3d2:581::c:2a"; priv44-gw = "fd23:42:c3d2:581::c:2b"; priv45-gw = "fd23:42:c3d2:581::c:2c"; + priv46-gw = "fd23:42:c3d2:581::c:2d"; priv5-gw = "fd23:42:c3d2:581::c:4"; priv6-gw = "fd23:42:c3d2:581::c:5"; priv7-gw = "fd23:42:c3d2:581::c:6"; @@ -183,6 +185,7 @@ priv43-gw = "2a00:8180:2c00:281::c:2a"; priv44-gw = "2a00:8180:2c00:281::c:2b"; priv45-gw = "2a00:8180:2c00:281::c:2c"; + priv46-gw = "2a00:8180:2c00:281::c:2d"; priv5-gw = "2a00:8180:2c00:281::c:4"; priv6-gw = "2a00:8180:2c00:281::c:5"; priv7-gw = "2a00:8180:2c00:281::c:6"; diff --git a/config/net/priv.nix b/config/net/priv.nix index af49442..61c5d7a 100644 --- a/config/net/priv.nix +++ b/config/net/priv.nix @@ -1,6 +1,6 @@ { lib, ... }: let - privCount = 45; + privCount = 46; seq = n: max: if n <= max then [ n ] ++ seq (n + 1) max @@ -422,6 +422,14 @@ lib.mkMerge ( end = "172.20.77.174"; }; }; + priv46 = { + hosts4 = { priv46-gw = "172.20.77.225"; }; + subnet4 = "172.20.77.224/29"; + dhcp = { + start = "172.20.77.225"; + end = "172.20.77.230"; + }; + }; }; site.hosts = { @@ -710,6 +718,12 @@ lib.mkMerge ( priv45.hwaddr = "0A:14:48:01:2A:57"; }; }; + priv46-gw = { + interfaces = { + core.hwaddr = "0A:14:48:01:2A:58"; + priv46.hwaddr = "0A:14:48:01:2A:59"; + }; + }; }; } ] ) diff --git a/config/switch.nix b/config/switch.nix index d8884a4..82e3eb4 100644 --- a/config/switch.nix +++ b/config/switch.nix @@ -156,6 +156,7 @@ priv2.ports = [ "ge-1/0/4" ]; priv24.ports = [ "ge-0/0/6" "ge-1/0/16" ]; priv3.ports = [ "ge-1/0/5" ]; + priv46.ports = [ "ge-0/0/45" ]; pub.ports = [ "ge-1/0/11" ]; diff --git a/contact.md.asc b/contact.md.asc index d610596..6162c4c 100644 Binary files a/contact.md.asc and b/contact.md.asc differ