From 9cb5a0af7f609b7195b1743e4c42613fc30d183f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= Date: Thu, 2 May 2019 17:39:07 +0000 Subject: space_server: renumber Fiberby link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Asbjørn Sloth Tønnesen --- documentation/addressplan.txt | 22 +++++++++++++++------- roles/space_server/files/bird/peers4.conf | 2 +- roles/space_server/files/bird/peers6.conf | 4 ++-- roles/space_server/files/networkd/10-wan.network | 18 ++++++++++++++---- roles/space_server/files/nftables.conf | 2 +- 5 files changed, 33 insertions(+), 15 deletions(-) diff --git a/documentation/addressplan.txt b/documentation/addressplan.txt index 151ffce..ad5e0f2 100644 --- a/documentation/addressplan.txt +++ b/documentation/addressplan.txt @@ -37,12 +37,20 @@ Linknets: -**** 193.106.167.40/29 - Fiberby IPv4 linknet - * 193.106.167.41 - tgccr1.fiberby.net +**** 193.106.167.40/29 - Fiberby IPv4 linknet assigned + ** 193.106.167.40/31 - assigned for tgccr1 - space link + * 193.106.167.40 - tgccr1.fiberby.net + * 193.106.167.41 - space.labitat.dk + ** 193.106.167.42/31 - assigned for inxcr1 - space link * 193.106.167.42 - inxcr1.fiberby.net - * 193.106.167.46 - space.labitat.dk + * 193.106.167.43 - space.labitat.dk + ** 193.106.167.44/31 - allocated for tgccr1 - future secondary space router link + ** 193.106.167.46/31 - allocated for inxcr1 - future secondary space router link -*** 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 +*** 2a03:5440:1:2935:1ab:1::/120 - Fiberby IPv6 linknet 1 + * 2a03:5440:1:2935:1ab:1::1 - tgccr1.fiberby.net + * 2a03:5440:1:2935:1ab:1::2 - space.labitat.dk + +*** 2a03:5440:1:2935:1ab:2::/120 - Fiberby IPv6 linknet 2 + * 2a03:5440:1:2935:1ab:2::1 - inxcr1.fiberby.net + * 2a03:5440:1:2935:1ab:2::2 - space.labitat.dk diff --git a/roles/space_server/files/bird/peers4.conf b/roles/space_server/files/bird/peers4.conf index 6f0cc96..ac4fa69 100644 --- a/roles/space_server/files/bird/peers4.conf +++ b/roles/space_server/files/bird/peers4.conf @@ -3,7 +3,7 @@ template bgp fiberby from bgp_transit { protocol bgp fiberby_tgc from fiberby { preference 90; - neighbor 193.106.167.41 as 42541; + neighbor 193.106.167.40 as 42541; } protocol bgp fiberby_inx from fiberby { diff --git a/roles/space_server/files/bird/peers6.conf b/roles/space_server/files/bird/peers6.conf index ee1fbfe..a78d8c6 100644 --- a/roles/space_server/files/bird/peers6.conf +++ b/roles/space_server/files/bird/peers6.conf @@ -3,9 +3,9 @@ template bgp fiberby from bgp_transit { protocol bgp fiberby_tgc from fiberby { preference 90; - neighbor 2a03:5440:1:2935:1ab::1 as 42541; + neighbor 2a03:5440:1:2935:1ab:1::1 as 42541; } protocol bgp fiberby_inx from fiberby { - neighbor 2a03:5440:1:2935:1ab::2 as 42541; + neighbor 2a03:5440:1:2935:1ab:2::1 as 42541; } diff --git a/roles/space_server/files/networkd/10-wan.network b/roles/space_server/files/networkd/10-wan.network index 1d14dee..b36609f 100644 --- a/roles/space_server/files/networkd/10-wan.network +++ b/roles/space_server/files/networkd/10-wan.network @@ -4,8 +4,10 @@ Name=wan [Network] DHCP=no IPv6AcceptRA=no -Address=193.106.167.46/29 -Address=2a03:5440:1:2935:1ab::3/120 +Address=193.106.167.41/31 +Address=193.106.167.43/31 +Address=2a03:5440:1:2935:1ab:1::2/120 +Address=2a03:5440:1:2935:1ab:2::2/120 IPForward=yes LLMNR=no MulticastDNS=no @@ -13,9 +15,17 @@ LLDP=yes EmitLLDP=no [Route] -Gateway=193.106.167.42 +Gateway=193.106.167.40 Metric=1024 [Route] -Gateway=2a03:5440:1:2935:1ab::2 +Gateway=193.106.167.42 +Metric=1025 + +[Route] +Gateway=2a03:5440:1:2935:1ab:1::1 Metric=1024 + +[Route] +Gateway=2a03:5440:1:2935:1ab:2::1 +Metric=1025 diff --git a/roles/space_server/files/nftables.conf b/roles/space_server/files/nftables.conf index 8b3124c..34d56f3 100644 --- a/roles/space_server/files/nftables.conf +++ b/roles/space_server/files/nftables.conf @@ -11,7 +11,7 @@ define int_net4 = 10.42.0.0/16 define ext_net4 = 185.38.175.0/24 define ext_net6 = 2a01:4262:1ab::/48 define link_net4 = 193.106.167.40/29 -define link_net6 = 2a03:5440:1:2935:1ab::/120 +define link_net6 = 2a03:5440:1:2935:1ab::/80 define adm_if = lan10 define adm_ip4 = 10.42.0.1 -- cgit v1.2.1