From fb69152675ef158fec0d6d9333bac8a33d2311a8 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 20 Feb 2023 19:51:13 +0100 Subject: [PATCH] deploy priv46 --- cabling.md | 2 +- config/net/core.nix | 3 +++ config/net/priv.nix | 16 +++++++++++++++- config/switch.nix | 1 + contact.md.asc | Bin 2297 -> 2333 bytes 5 files changed, 20 insertions(+), 2 deletions(-) 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 d6105964ec9f4d7d88db74afe3fbace73e1390a5..6162c4c244d133b19aaae1048399e34ca75d646c 100644 GIT binary patch literal 2333 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 T`-aU+DONZnbv=*$#$-kaNm*e>