diff --git a/README.md b/README.md index 16aa1e9..c46802e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ Wir, ein kleiner Kreis von Menschen die das Netzwerk im Zentralwerk betreuen, ha * [Verkabelung Patchpanel Haus B](cabling.md) * TODO: tuerme, saal -* [Planung der IP-Adressbereiche](subnets.md) * (verschlüsselte) [Kontakte zu den Personen mit den einzelnen Anschlüssen](contact.md.gpg) * Dokumentation * [WiFi-Provisionierung](doc/wifi-provisioning.md) und Erstellung von Privatnetzen diff --git a/subnets.md b/subnets.md deleted file mode 100644 index 75ccf2e..000000000 --- a/subnets.md +++ /dev/null @@ -1,121 +0,0 @@ -Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) - -## RFC 1918: 172.20.72.0/21 - -* 172.20.72.0-172.20.72.127/25 CORE -* 172.20.72.128/25 -* 172.20.73.0-172.20.73.63/26 SERVERS -* 172.20.73.64/26 RESERVED FOR EXPANDING SERVERS -* 172.20.73.128/27 PRIV17 -* 172.20.73.160/27 PRIV23 -* 172.20.73.192/26 PRIV19 -* 172.20.74.0/24: - * 172.20.74.0/28 PRIV1 - * 172.20.74.16/28 PRIV33 - * 172.20.74.32/28 PRIV9 - * 172.20.74.48/28 PRIV18 - * 172.20.74.64/28 PRIV5 - * 172.20.74.80/28 PRIV25 - * 172.20.74.96/28 PRIV10 - * 172.20.74.112/28 PRIV20 - * 172.20.74.128/28 PRIV3 - * 172.20.74.144/28 PRIV21 - * 172.20.74.160/28 PRIV11 - * 172.20.74.176/28 PRIV22 - * 172.20.74.192/28 PRIV6 - * 172.20.74.208/28 PRIV34 - * 172.20.74.224/28 PRIV12 - * 172.20.74.240/28 PRIV24 -* 172.20.75.0/24 - * 172.20.75.0-172.20.75.31/27 PRIV2 - * 172.20.75.32-172.20.75.47/28 PRIV13 - * 172.20.75.48-172.20.75.63/28 PRIV26 - * 172.20.75.64-172.20.75.79/28 PRIV7 - * 172.20.75.80-172.20.75.95/28 PRIV27 - * 172.20.75.96-172.20.75.111/28 PRIV14 - * 172.20.75.112-172.20.75.127/28 PRIV28 - * 172.20.75.128-172.20.75.143/28 PRIV4 - * 172.20.75.144-172.20.75.159/28 PRIV29 - * 172.20.75.160-172.20.75.175/28 PRIV15 - * 172.20.75.176-172.20.75.191/28 PRIV30 - * 172.20.75.192-172.20.75.207/28 PRIV8 - * 172.20.75.208-172.20.75.223/28 PRIV31 - * 172.20.75.224-172.20.75.239/28 PRIV16 - * 172.20.75.240-172.20.75.255/28 PRIV32 -* 172.20.76.0-172.20.76.255/24 - * 172.20.76.0-172.20.76.15/28 PRIV35 - * 172.20.76.32-172.20.77.47/28 PRIV42 - * 172.20.76.64-172.20.76.79/28 PRIV36 - * 172.20.76.128-172.20.76.143/28 PRIV37 - * 172.20.76.192-172.20.76.207/28 PRIV38 -* 172.20.77.0-172.20.77.255/24 - * 172.20.77.0-172.20.77.31/27 CLUSTER - * 172.20.77.64-172.20.77.79/28 PRIV40 - * 172.20.77.128-172.20.77.143/28 PRIV39 - * 172.20.77.192-172.20.77.207/28 PRIV41 -* 172.20.78.0-172.20.79.255/23 PUBLIC - -## RFC 1918: non-routed - -* 10.0.0.0/24 HW-MGMT -* 192.168.*.0/24 PRIVs? - -## ULA: fd23:42:c3d2:500::/56 - -* fd23:42:c3d2:523::/64 C3D2 - -* fd23:42:c3d2:581::/64 CORE -* fd23:42:c3d2:582::/64 SERV -* fd23:42:c3d2:583::/64 PUBLIC -* fd23:42:c3d2:584::/64 CLUSTER -* fd23:42:c3d2:5c0::/64 PRIV1 -* fd23:42:c3d2:5c1::/64 PRIV2 -* fd23:42:c3d2:5c2::/64 PRIV3 -* fd23:42:c3d2:5c3::/64 PRIV4 -* fd23:42:c3d2:5c4::/64 PRIV5 -* fd23:42:c3d2:5c5::/64 PRIV6 -* fd23:42:c3d2:5c6::/64 PRIV7 -* fd23:42:c3d2:5c7::/64 PRIV8 -* fd23:42:c3d2:5c8::/64 PRIV9 -* fd23:42:c3d2:5c9::/64 PRIV10 -* fd23:42:c3d2:5ca::/64 PRIV11 -* fd23:42:c3d2:5cb::/64 PRIV12 -* fd23:42:c3d2:5cc::/64 PRIV13 -* fd23:42:c3d2:5cd::/64 PRIV14 -* fd23:42:c3d2:5ce::/64 PRIV15 -* fd23:42:c3d2:5cf::/64 PRIV16 -* […] PRIV61 - -# Peer C3D2: - -* 172.22.99.0/24 - -## DSI fixed IPv4 -* 81.201.149.152 (up4) - -## DSI fixed IPv6 -* 2a00:8180:2000:37::1/64 (up4) -* 2a00:8180:2c00:200::/56 - -* 2a00:8180:2c00:223::/64 C3D2 - -* 2a00:8180:2c00:281::/64 CORE -* 2a00:8180:2c00:282::/64 SERV -* 2a00:8180:2c00:284::/64 CLUSTER -* 2a00:8180:2c00:2c0::/64 PRIV1 -* 2a00:8180:2c00:2c1::/64 PRIV2 -* 2a00:8180:2c00:2c2::/64 PRIV3 -* 2a00:8180:2c00:2c3::/64 PRIV4 -* 2a00:8180:2c00:2c4::/64 PRIV5 -* 2a00:8180:2c00:2c5::/64 PRIV6 -* 2a00:8180:2c00:2c6::/64 PRIV7 -* 2a00:8180:2c00:2c7::/64 PRIV8 -* 2a00:8180:2c00:2c8::/64 PRIV9 -* 2a00:8180:2c00:2c9::/64 PRIV10 -* 2a00:8180:2c00:2ca::/64 PRIV11 -* 2a00:8180:2c00:2cb::/64 PRIV12 -* 2a00:8180:2c00:2cc::/64 PRIV13 -* 2a00:8180:2c00:2cd::/64 PRIV14 -* 2a00:8180:2c00:2ce::/64 PRIV15 -* 2a00:8180:2c00:2cf::/64 PRIV16 -* […] PRIV61