aboutsummaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorAsbjørn Sloth Tønnesen <asbjorn@labitat.dk>2024-02-21 23:11:19 +0000
committerEmil Renner Berthing <esmil@labitat.dk>2024-02-22 21:05:10 +0100
commit851a1ddc003fd023ae7e3d515732f21f40969de8 (patch)
tree5913e63f6710d4bee7651405f0fd129fe83a71da /documentation
parent1840d35e8cb5e5d0b9f91ce9660f056e1c6d4f87 (diff)
downloadlabitat-ansible-851a1ddc003fd023ae7e3d515732f21f40969de8.tar.gz
labitat-ansible-851a1ddc003fd023ae7e3d515732f21f40969de8.tar.xz
labitat-ansible-851a1ddc003fd023ae7e3d515732f21f40969de8.zip
space_server: networkd: add new secondary Labicolo network
This completes the split of Labicolo into two networks. Henceforth we have two Labicolo network, and any two Labicolo nodes on different parts of the network will have to join LabIX, if they want to peer. Signed-off-by: Asbjørn Sloth Tønnesen <asbjorn@labitat.dk>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/addressplan.txt3
-rw-r--r--documentation/vlans.txt1
2 files changed, 4 insertions, 0 deletions
diff --git a/documentation/addressplan.txt b/documentation/addressplan.txt
index 8a8cce3..8e439be 100644
--- a/documentation/addressplan.txt
+++ b/documentation/addressplan.txt
@@ -6,6 +6,8 @@
* 185.38.175.065 - space.labitat.dk, labicolo gateway
* 185.38.175.069 - spacebrain.labitat.dk
* 185.38.175.087 - blackbox.labitat.dk
+ ****** 185.38.175.096/27 - labicolo network B
+ * 185.38.175.097 - space.labitat.dk, labicolo gateway
***** 185.38.175.128/28 - Tor exit nodes
* 185.38.175.129 - space.labitat.dk - gateway
@@ -24,6 +26,7 @@
***************** 2a01:4262:1ab:000f::/64 - vlan 15 - member nat64
***************** 2a01:4262:1ab:0020::/64 - vlan 20 - labicolo network A
* 2a01:4262:1ab:0020::6 - spacebrain.labitat.dk
+ ***************** 2a01:4262:1ab:0021::/64 - vlan 21 - labicolo network B
******************** 2a01:4262:1ab:1xxx::/52 - labicolo 16x /56
******************* 2a01:4262:1ab:10xx::/56 - 256x /64 delegations
diff --git a/documentation/vlans.txt b/documentation/vlans.txt
index 4333e47..429b2e5 100644
--- a/documentation/vlans.txt
+++ b/documentation/vlans.txt
@@ -9,6 +9,7 @@ vlan 14 - wireless compat
vlan 15 - wireless nat64
vlan 20 - Labicolo network A
+vlan 21 - Labicolo network B
vlan 25 - Tor network
vlan 42 - LabIX
vlan 3145 - LocIX Frankfurt