diff options
| -rw-r--r-- | documentation/addressplan.txt | 4 | ||||
| -rw-r--r-- | documentation/vlans.txt | 2 | ||||
| -rw-r--r-- | roles/space_server/files/networkd/10-lan20.network | 2 |
3 files changed, 4 insertions, 4 deletions
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 diff --git a/roles/space_server/files/networkd/10-lan20.network b/roles/space_server/files/networkd/10-lan20.network index 9b8254f..b013c47 100644 --- a/roles/space_server/files/networkd/10-lan20.network +++ b/roles/space_server/files/networkd/10-lan20.network @@ -8,7 +8,7 @@ ARP=yes DHCP=no IPv6AcceptRA=no LinkLocalAddressing=no -Address=185.38.175.65/26 +Address=185.38.175.65/27 Address=2a01:4262:1ab:20::1/64 Address=fe80::1/64 IPForward=yes |