From 1840d35e8cb5e5d0b9f91ce9660f056e1c6d4f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= Date: Wed, 21 Feb 2024 23:11:18 +0000 Subject: space_server: networkd: reduce Labicolo to a /27 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I want to split Labicolo up in two networks, since it is a bit silly that we have a internet exchange prefix allocation, when all members of the IX are already connected to the same layer 2 network, when they all have transit through the same network. Therefore by splitting Labicolo into 2 networks, we ensure that there is a need for the internet exchange, since not all nodes are able to talk directly to eachother over the transit layer 2 network. Since it would be a bit excessive to allocate another /26 to Labicolo, thereby using half of our IPv4 space for Labicolo. This patch reduces the the current Labicolo network to a /27 network, a subsequent patch will then add a second Labicolo network with the other /27 network. The only issue here is that Labicolo machines, which haven't been updated to have a /27 netmask, will not be able to reach endpoints in 185.38.175.96/27, before they fix their netmask. Signed-off-by: Asbjørn Sloth Tønnesen --- documentation/addressplan.txt | 4 ++-- documentation/vlans.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'documentation') diff --git a/documentation/addressplan.txt b/documentation/addressplan.txt index 499f313..8a8cce3 100644 --- a/documentation/addressplan.txt +++ b/documentation/addressplan.txt @@ -2,7 +2,7 @@ ******* 185.38.175.000/26 - labitat internal use * 185.38.175.000 - space.labitat.dk, router-id + NAT (wired + auth wifi) * 185.38.175.001 - space.labitat.dk, NAT (unauth wifi) - ******* 185.38.175.064/26 - labicolo + ****** 185.38.175.064/27 - labicolo network A * 185.38.175.065 - space.labitat.dk, labicolo gateway * 185.38.175.069 - spacebrain.labitat.dk * 185.38.175.087 - blackbox.labitat.dk @@ -22,7 +22,7 @@ ***************** 2a01:4262:1ab:000d::/64 - vlan 13 - free ***************** 2a01:4262:1ab:000e::/64 - vlan 14 - member compat wireless ***************** 2a01:4262:1ab:000f::/64 - vlan 15 - member nat64 - ***************** 2a01:4262:1ab:0020::/64 - vlan 20 - labicolo + ***************** 2a01:4262:1ab:0020::/64 - vlan 20 - labicolo network A * 2a01:4262:1ab:0020::6 - spacebrain.labitat.dk ******************** 2a01:4262:1ab:1xxx::/52 - labicolo 16x /56 diff --git a/documentation/vlans.txt b/documentation/vlans.txt index 778a5ea..4333e47 100644 --- a/documentation/vlans.txt +++ b/documentation/vlans.txt @@ -8,7 +8,7 @@ vlan 13 - wireless free vlan 14 - wireless compat vlan 15 - wireless nat64 -vlan 20 - Labicolo +vlan 20 - Labicolo network A vlan 25 - Tor network vlan 42 - LabIX vlan 3145 - LocIX Frankfurt -- cgit v1.2.1