From 19b992e35cb3519a39f8836e96c49c90e96be30a Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Sat, 2 Nov 2019 20:10:47 +0000 Subject: [PATCH] Remove a few nodes --- pages/01.home/ipam/default.md | 17 ++--- pages/01.home/maintenance-log/default.md | 5 ++ pages/02.peering/default.md | 88 +----------------------- 3 files changed, 14 insertions(+), 96 deletions(-) diff --git a/pages/01.home/ipam/default.md b/pages/01.home/ipam/default.md index 9d1eda4..cc5d084 100755 --- a/pages/01.home/ipam/default.md +++ b/pages/01.home/ipam/default.md @@ -37,15 +37,15 @@ burble.dn42 IP addresses |dn42-us-nyc1.burble.dn42|172.20.129.168|fd42:4242:2601:34::1|| |dn42-de-fra1.burble.dn42|172.20.129.169|fd42:4242:2601:31::1|| |dn42-us-sea2.burble.dn42|172.20.129.170|fd42:4242:2601:2c::1|| -|dn42-us-chi2.burble.dn42|172.20.129.171|fd42:4242:2601:2b::1|Retiring, Nov 2019| +|*dn42-us-chi2.burble.dn42*|*172.20.129.171*|*fd42:4242:2601:2b::1*|Retired| |dn42-us-dal3.burble.dn42|172.20.129.172|fd42:4242:2601:2a::1|| |dn42-us-dal1.burble.dn42|172.20.129.173|fd42:4242:2601:3b::1|| -|dn42-us-lax2.burble.dn42|172.20.129.174|fd42:4242:2601:28::1|Retiring, Nov 2019| +|*dn42-us-lax2.burble.dn42*|*172.20.129.174*|*fd42:4242:2601:28::1*|Retired| |dn42-uk-lon4.burble.dn42|172.20.129.175|fd42:4242:2601:29::1|Private Node| -|dn42-no-osl1.burble.dn42|172.20.129.176|fd42:4242:2601:26::1|| -|dn42-ca-bhs1.burble.dn42|172.20.129.177|fd42:4242:2601:25::1|Retiring, Nov 2019| +|*dn42-no-osl1.burble.dn42*|*172.20.129.176*|*fd42:4242:2601:26::1*|Retired| +|*dn42-ca-bhs1.burble.dn42*|*172.20.129.177*|*fd42:4242:2601:25::1*|Retired| |dn42-uk-lon2.burble.dn42|172.20.129.178|fd42:4242:2601:24::1|Private Node| -|dn42-tr-ist1.burble.dn42|172.20.129.179|fd42:4242:2601:23::1|Retiring, Nov 2019| +|*dn42-tr-ist1.burble.dn42*|*172.20.129.179*|*fd42:4242:2601:23::1*|Retired| |dn42-au-syd1.burble.dn42|172.20.129.180|fd42:4242:2601:38::1|| |dn42-sg-sin2.burble.dn42|172.20.129.181|fd42:4242:2601:37::1|| |dn42-jp-tyo1.burble.dn42|172.20.129.182|fd42:4242:2601:3e::1|| @@ -67,23 +67,18 @@ burble.dn42 IP addresses |dn42-uk-lon1.burble.com|185.121.25.242|2a04:92c7:e:bd2::e6b9|| |dn42-uk-lon2.burble.com|185.121.25.166|2a04:92c7:e:537::96cb|| |dn42-uk-lon4.burble.com|45.91.93.104|2a0e:dc0:5:5::1|| -|dn42-no-osl1.burble.com|185.175.56.155|2a0d:5600:30:18::8c3a|| |dn42-de-fra1.burble.com|176.96.138.245|2a0d:5940:1:c3::b35c|| |dn42-lt-vil1.burble.com|195.181.241.93|2a02:7b40:c3b5:f15d::1|| |dn42-at-vie1.burble.com|185.175.58.235|2a0d:5600:31:7::1|| -|dn42-tr-ist1.burble.com|185.181.210.90| || -|dn42-ca-bhs1.burble.com|54.39.20.247|2607:5300:201:3100::3c20|| |dn42-ca-bhs2.burble.com|192.99.2.172|2607:5300:60:33ac::1|| |dn42-us-nyc1.burble.com|185.213.26.143|2a0d:5600:33:b::1|| |dn42-us-chi1.burble.com|193.29.63.150|2605:4840:3:10::ab2d|| -|dn42-us-chi2.burble.com|198.46.223.227| || |dn42-us-mia2.burble.com|216.126.233.109|2a09:be40:2908:bc43::1|| |dn42-us-sea2.burble.com|96.8.121.205| || |dn42-us-dal1.burble.com|144.172.126.201| || |dn42-us-dal3.burble.com|107.155.79.108|2604:880:398:353::1|| |dn42-us-lax1.burble.com|185.198.26.172|2a04:bdc7:100:14::ab2d|| -|dn42-us-lax2.burble.com|104.168.88.15| || |dn42-sg-sin2.burble.com|139.99.97.88|2402:1f00:8000:800::8d2|| |dn42-au-syd1.burble.com|139.99.194.24|2402:1f00:8100:400::986|| -|dn42-jp-tyo1.burble.com|172.93.221.20|2403:71c0:2000::d:8b97|| +|dn42-jp-tyo1.burble.com|172.93.221.101|2403:71c0:2000::d:8b97|| diff --git a/pages/01.home/maintenance-log/default.md b/pages/01.home/maintenance-log/default.md index 3eef8f8..cd4b81f 100755 --- a/pages/01.home/maintenance-log/default.md +++ b/pages/01.home/maintenance-log/default.md @@ -10,6 +10,11 @@ A log of changes to the burble.dn42 network. ## burble.dn42 Maintenance Log +#### 2nd November 2019 + +Retired dn42-us-lax2, dn42-us-chi2, dn42-ca-bhs1, dn42-tr-ist1 and dn42-no-osl1. +Restructured the internal confederations. + #### 26th October 2019 New experimental node added hosted in the Oracle Cloud environment in Mumbai, India. diff --git a/pages/02.peering/default.md b/pages/02.peering/default.md index df3bbea..dc9bd5a 100755 --- a/pages/02.peering/default.md +++ b/pages/02.peering/default.md @@ -186,7 +186,7 @@ When peering with burble.dn42 the DN42 assigned AS4242422601 should always be us |**IPv4 Prefix (Nodes)** |172.20.129.160/27| |**IPv6 Prefix**|fd42:4242:2601::/48| -###North and West Europe Core +### Europe Internal ASN: AS4226010150 ####dn42-fr-rbx1 @@ -213,21 +213,6 @@ Internal ASN: AS4226010150 |**Tunnel IPv6 Link Local**|fe80::42:2601:35:1/64| |**Tunnel IPv6 ULA**|fd42:4242:2601:35::1/128| -####dn42-no-osl1 - -`dn42-no-osl1 will be retired November 2019` - -||| -|---|---| -|**Location**|HostHatch, Oslo, Norway| -|**Alias**|seyfert| -|**Public Hostname**|dn42-no-osl1.burble.com| -|**Public IPv4 Address**|185.175.56.155| -|**Public IPv6 Address**|2a0d:5600:30:18::8c3a| -|**Tunnel IPv4 Peer Address**|172.20.129.176/32| -|**Tunnel IPv6 Link Local**|fe80::42:2601:26:1/64| -|**Tunnel IPv6 ULA**|fd42:4242:2601:26::1/128| - ####dn42-de-fra1 ||| |---|---| @@ -240,9 +225,6 @@ Internal ASN: AS4226010150 |**Tunnel IPv6 Link Local**|fe80::42:2601:31:1/64| |**Tunnel IPv6 ULA**|fd42:4242:2601:31::1/128| -###Eastern Europe -Internal ASN: AS4226010151 - ####dn42-lt-vil1 ||| |---|---| @@ -267,23 +249,7 @@ Internal ASN: AS4226010151 |**Tunnel IPv6 Link Local**|fe80::42:2601:39:1/64| |**Tunnel IPv6 ULA**|fd42:4242:2601:39::1/128| -####dn42-tr-ist1 - -`dn42-tr-ist1 will be retired November 2019` - -||| -|---|---| -|**Location**|HostTigger, Istanbul, Turkey| -|**Alias**|virgo| -|**Public Hostname**|dn42-tr-ist1.burble.com| -|**Public IPv4 Address**|185.181.210.90| -|**Public IPv6 Address**|`IPv4 Only`| -|**Tunnel IPv4 Peer Address**|172.20.129.179/32| -|**Tunnel IPv6 Link Local**|fe80::42:2601:23:1/64| -|**Tunnel IPv6 ULA**|fd42:4242:2601:23::1/128| -|**X.509 Host Certificate**|[dn42-tr-ist1.pem](/home/certificate-authority/certs/dn42-tr-ist1.pem)| - -###North America (East Coast) +### North America Internal ASN: AS4226010021 ####dn42-ca-bhs2 @@ -298,36 +264,6 @@ Internal ASN: AS4226010021 |**Tunnel IPv6 Link Local**|fe80::42:2601:2d:1/64| |**Tunnel IPv6 ULA**|fd42:4242:2601:2d::1/128| -####dn42-ca-bhs1 - -`dn42-ca-bhs1 will be retired Nov 2019 and is replaced by dn42-ca-bhs2` - -||| -|---|---| -|**Location**|OVH, Beauharnois, Canada| -|**Alias**|comet| -|**Public Hostname**|dn42-ca-bhs1.burble.com| -|**Public IPv4 Address**|54.39.20.247| -|**Public IPv6 Address**|2607:5300:201:3100::3c20| -|**Tunnel IPv4 Peer Address**|172.20.129.177/32| -|**Tunnel IPv6 Link Local**|fe80::42:2601:25:1/64| -|**Tunnel IPv6 ULA**|fd42:4242:2601:25::1/128| - -####dn42-us-chi2 - -`dn42-us-chi2 will be retired Nov 2019 and is replaced by dn42-us-ch1` - -||| -|---|---| -|**Location**|VirMach, Chicago, United States| -|**Alias**|markarian| -|**Public Hostname**|dn42-us-chi2.burble.com| -|**Public IPv4 Address**|198.46.223.227| -|**Public IPv6 Address**|`IPv4 Only`| -|**Tunnel IPv4 Peer Address**|172.20.129.171/32| -|**Tunnel IPv6 Link Local**|fe80::42:2601:2b:1/64| -|**Tunnel IPv6 ULA**|fd42:4242:2601:2b::1/128| - ####dn42-us-chi1 ||| @@ -366,9 +302,6 @@ Internal ASN: AS4226010021 |**Tunnel IPv6 Link Local**|fe80::42:2601:34:1/64| |**Tunnel IPv6 ULA**|fd42:4242:2601:34::1/128| -###North America (Central & West Coast) -Internal ASN: AS4226011021 - ####dn42-us-dal1 ||| |---|---| @@ -405,21 +338,6 @@ Internal ASN: AS4226011021 |**Tunnel IPv6 Link Local**|fe80::42:2601:3a:1/64| |**Tunnel IPv6 ULA**|fd42:4242:2601:3a::1/128| -####dn42-us-lax2 - -`dn42-us-lax2 will be retired Nov 2019 and is replaced by dn42-us-lax1` - -||| -|---|---| -|**Location**|VirMach, Los Angeles, United States| -|**Alias**|messier| -|**Public Hostname**|dn42-us-lax2.burble.com| -|**Public IPv4 Address**|104.168.88.15| -|**Public IPv6 Address**|`IPv4 Only`| -|**Tunnel IPv4 Peer Address**|172.20.129.174/32| -|**Tunnel IPv6 Link Local**|fe80::42:2601:28:1/64| -|**Tunnel IPv6 ULA**|fd42:4242:2601:28::1/128| - ####dn42-us-sea2 ||| |---|---| @@ -432,7 +350,7 @@ Internal ASN: AS4226011021 |**Tunnel IPv6 Link Local**|fe80::42:2601:2c:1/64| |**Tunnel IPv6 ULA**|fd42:4242:2601:2c::1/128| -###Asia and Oceania +### Asia and Oceania Internal ASN: AS4226010009 ####dn42-sg-sin2