diff options
| author | Emil Renner Berthing <esmil@labitat.dk> | 2018-11-28 20:33:41 +0100 |
|---|---|---|
| committer | Emil Renner Berthing <esmil@labitat.dk> | 2018-11-28 21:13:48 +0100 |
| commit | ed9133359abca62f2be8414dca767401565ddb15 (patch) | |
| tree | c77a603ac5a649b565de3090d0d90e926ee86361 /documentation | |
| parent | 38fe626bdb009da2bc636c6c20d908b0afa7fbff (diff) | |
| download | labitat-ansible-ed9133359abca62f2be8414dca767401565ddb15.tar.gz labitat-ansible-ed9133359abca62f2be8414dca767401565ddb15.tar.xz labitat-ansible-ed9133359abca62f2be8414dca767401565ddb15.zip | |
documentation: update and fix addressplan
- Align addresses
- Prefix ipv4 addresses by network bits + 1 *s
- Prefix ipv6 addresses by network nibbles + 1 *s
- Fix labitat prefix
- Add spacewand and spacebrain addresses
Diffstat (limited to 'documentation')
| -rw-r--r-- | documentation/addressplan.txt | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/documentation/addressplan.txt b/documentation/addressplan.txt index b6f96e2..7e8aa6e 100644 --- a/documentation/addressplan.txt +++ b/documentation/addressplan.txt @@ -1,43 +1,42 @@ -185.38.175.0/24 - allocated and announced -- 185.38.175.0/26 - first /26 - only first /31 used - - 185.38.175.0/32 - space: router-id + NAT (wired + auth wifi) - - 185.38.175.1/32 - space: NAT (unauth wifi) -- 185.38.175.64/26 - vlan20 - labicolo - - 185.38.175.65 - <gateway> - - 185.38.175.69 - spacebrain.labitat.dk - - 185.38.175.70 - spacewand.labitat.dk - - 185.38.175.71 - torexit.space.labitat.dk - tor exit node - - 185.38.175.75 - labicolo - asbjorn +********* 185.38.175.000/24 - allocated and announced + ******* 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.065 - space.labitat.dk, labicolo gateway + * 185.38.175.069 - spacebrain.labitat.dk + * 185.38.175.070 - spacewand.labitat.dk + * 185.38.175.071 - reserved for tor exit node -2a01:4260:1ab::/48 - allocated and announced -- 2a01:4260:1ab:0xxx::/52 - labitat internal use - - 2a01:4260:1ab:00xx::/56 - - 2a01:4260:1ab:0000::/64 - vanity - - 2a01:4262:1ab:: - space - - 2a01:4262:1ab::cafe - spacewand - - 2a01:4262:1ab::db - spacebrain - - 2a01:4260:1ab:000a::/64 - vlan 10 - - 2a01:4260:1ab:000b::/64 - vlan 11 - - 2a01:4260:1ab:000c::/64 - vlan 12 - - 2a01:4260:1ab:000d::/64 - vlan 13 - - 2a01:4260:1ab:000e::/64 - vlan 14 - - 2a01:4260:1ab:000f::/64 - vlan 15 - - 2a01:4260:1ab:0020::/64 - vlan 20 - -- 2a01:4260:1ab:1xxx::/52 - labicolo 16x /56 - - 2a01:4260:1ab:10xx::/56 - 256x /64 delegations - - 2a01:4260:1ab:11xx::/56 - 16x /60 delegations +********************* 2a01:4262:1ab:0000::/48 - allocated and announced + ******************** 2a01:4262:1ab:0xxx::/52 - labitat internal use + ***************** 2a01:4262:1ab:0000::/64 - vanity + * 2a01:4262:1ab:0000:: - space.labitat.dk + * 2a01:4262:1ab:0000::cafe - spacewand.labitat.dk + * 2a01:4262:1ab:0000::db - spacebrain.labitat.dk + ***************** 2a01:4262:1ab:000a::/64 - vlan 10 - infrastructure + ***************** 2a01:4262:1ab:000b::/64 - vlan 11 - member wired + ***************** 2a01:4262:1ab:000c::/64 - vlan 12 - member wireless + ***************** 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::5 - spacewand.labitat.dk + * 2a01:4262:1ab:0020::6 - spacebrain.labitat.dk + ******************** 2a01:4262:1ab:1xxx::/52 - labicolo 16x /56 + ******************* 2a01:4262:1ab:10xx::/56 - 256x /64 delegations + ******************* 2a01:4262:1ab:11xx::/56 - 16x /60 delegations Linknets: -193.106.167.40/29 - Fiberby IPv4 linknet -- 193.106.167.41 - tgccr1.fiberby.net -- 193.106.167.42 - inxcr1.fiberby.net -- 193.106.167.46 - space +**** 193.106.167.40/29 - Fiberby IPv4 linknet + * 193.106.167.41 - tgccr1.fiberby.net + * 193.106.167.42 - inxcr1.fiberby.net + * 193.106.167.46 - space.labitat.dk -2a03:5440:1:2935:1ab::/120 - Fiberby IPv6 linknet -- 2a03:5440:1:2935:1ab::1 - tgccr1.fiberby.net -- 2a03:5440:1:2935:1ab::2 - inxcr1.fiberby.net -- 2a03:5440:1:2935:1ab::3 - space +*** 2a03:5440:1:2935:1ab::/120 - Fiberby IPv6 linknet + * 2a03:5440:1:2935:1ab::1 - tgccr1.fiberby.net + * 2a03:5440:1:2935:1ab::2 - inxcr1.fiberby.net + * 2a03:5440:1:2935:1ab::3 - space.labitat.dk |