diff --git a/site/content/additional/maintlog/_index.md b/site/content/additional/maintlog/_index.md
index bc1afa7..45d9e76 100644
--- a/site/content/additional/maintlog/_index.md
+++ b/site/content/additional/maintlog/_index.md
@@ -7,6 +7,20 @@ A log of changes to the burble.dn42 network.
---
+## 19th May 2021
+
+[dn42regsrv](https://git.burble.dn42/burble.dn42/dn42regsrv) now supports publishing ROA in OpenBGPD format.
+
+The ROA are now published at the following links:
+ - [https://dn42.burble.com/roa/dn42_roa_obgpd_46.conf](https://dn42.burble.com/roa/dn42_roa_obgpd_46.conf)
+ - [https://dn42.burble.com/roa/dn42_roa_obgpd_4.conf](https://dn42.burble.com/roa/dn42_roa_obgpd_4.conf)
+ - [https://dn42.burble.com/roa/dn42_roa_obgpd_6.conf](https://dn42.burble.com/roa/dn42_roa_obgpd_6.conf)
+
+{{}}
+us-nyc1 and us-chi1 have been removed from service and decommissioned.
+If you were peered on these nodes, please contact me if you wish to re-peer on a different node.
+{{}}
+
## 10th April 2021
The b.recursive-servers.dn42 DNS resovler is running an experimental build
diff --git a/site/content/network/IPAM.md b/site/content/network/IPAM.md
index 36b7487..ba1ed1e 100644
--- a/site/content/network/IPAM.md
+++ b/site/content/network/IPAM.md
@@ -22,7 +22,7 @@ IP address tables
|fd42:4242:2601:*AA*::/64|Public services for host *AA*|
|fd42:4242:2601:*AA*00::/56|/56 routed to host *AA*|
|fd42:4242:2601:*AA*02::/64|Tier2 services on host *AA*|
-
+|fd42:4242:2601:*AA*64::/64|NAT64 service related to host *AA*|
## burble.dn42 Services
@@ -31,7 +31,7 @@ IP address tables
| |172.20.129.0| |Reserved|
|ns1.burble.dn42|172.20.129.1|fd42:4242:2601:ac53::1|Authoritative DNS Master|
|dns.burble.dn42|172.20.129.2|fd42:4242:2601:ac53::53|Recursive DNS Resolver|
-|burble.dn42
www.burble.dn42|172.20.129.3|fd42:4242:2601:ac80::1|Website|
+|[burble.dn42](https://burble.dn42)
[www.burble.dn42](https://burble.dn42)|172.20.129.3|fd42:4242:2601:ac80::1|Website|
|collector.dn42|172.20.129.4|fd42:4242:2601:ac12::1|Global Route Collector|
|pingable.burble.dn42|172.20.129.5|fd42:4242:2601:ac05::1|Pingable IP Address|
|wiki.burble.dn42|172.20.129.6|fd42:4242:2601:ac81::1|DN42 Wiki Mirror|
@@ -44,36 +44,35 @@ IP address tables
|:--|:--|:--|:--|
|*unassigned* |172.20.129.164|fd42:4242:2601:3f::1||
|dn42-us-lax1.burble.dn42|172.20.129.165|fd42:4242:2601:3a::1||
-|dn42-us-chi1.burble.dn42|172.20.129.166|fd42:4242:2601:2e::1|{{}}Decom. May 2021{{}}|
+|*unassigned* |172.20.129.166|fd42:4242:2601:2e::1||
|dn42-ca-bhs2.burble.dn42|172.20.129.167|fd42:4242:2601:2d::1||
-|dn42-us-nyc1.burble.dn42|172.20.129.168|fd42:4242:2601:34::1|{{}}Decom. April 2021{{}}|
+|*unassigned* |172.20.129.168|fd42:4242:2601:34::1||
|dn42-de-fra1.burble.dn42|172.20.129.169|fd42:4242:2601:31::1||
|dn42-es-mad1.burble.dn42|172.20.129.170|fd42:4242:2601:2c::1||
-|dn42-us-phx1.burble.dn42|172.20.129.171|fd42:4242:2601:2b::1|Private Node|
+|us-phx1.burble.dn42 |172.20.129.171|fd42:4242:2601:2b::1|Private Node|
|dn42-us-dal3.burble.dn42|172.20.129.172|fd42:4242:2601:2a::1||
|*unassigned* |172.20.129.173|fd42:4242:2601:3b::1||
|dn42-ch-zur1.burble.dn42|172.20.129.174|fd42:4242:2601:28::1||
-|dn42-uk-lon4.burble.dn42|172.20.129.175|fd42:4242:2601:29::1|Private Node|
+|uk-lon4.burble.dn42 |172.20.129.175|fd42:4242:2601:29::1|Private Node|
|*unassigned* |172.20.129.176|fd42:4242:2601:26::1||
|*unassigned* |172.20.129.177|fd42:4242:2601:25::1||
-|dn42-uk-lon2.burble.dn42|172.20.129.178|fd42:4242:2601:24::1|Private Node|
+|uk-lon2.burble.dn42 |172.20.129.178|fd42:4242:2601:24::1|Private Node|
|dn42-hk-hkg1.burble.dn42|172.20.129.179|fd42:4242:2601:23::1||
|*unassigned* |172.20.129.180|fd42:4242:2601:38::1||
|dn42-sg-sin2.burble.dn42|172.20.129.181|fd42:4242:2601:37::1||
|*unassigned* |172.20.129.182|fd42:4242:2601:3e::1||
|*unassigned* |172.20.129.183|fd42:4242:2601:3c::1||
-|*unassigned* |172.20.129.184|fd42:4242:2601:22::1||
+|se-sto1.burble.dn42 |172.20.129.184|fd42:4242:2601:30::1|Private Node|
|dn42-no-trd1.burble.dn42|172.20.129.185|fd42:4242:2601:39::1||
-|dn42-fr-rbx2.burble.dn42|172.20.129.186|fd42:4242:2601:32::1|*Use fr-rbx1*|
+|nl-ams2.burble.dn42 |172.20.129.186|fd42:4242:2601:32::1|Private Node|
|dn42-uk-lon1.burble.dn42|172.20.129.187|fd42:4242:2601:35::1||
|dn42-fr-rbx1.burble.dn42|172.20.129.188|fd42:4242:2601:36::1||
|*unassigned* |172.20.129.189|fd42:4242:2601:3d::1||
|dn42-uk-bri1.burble.dn42|172.20.129.190|fd42:4242:2601:20::1|Private Node|
| |172.20.129.191| |Reserved|
-|dn42-uk-lon3.burble.dn42| |fd42:4242:2601:27::1|Private Node|
-|dn42-uk-lon4.burble.dn42| |fd42:4242:2601:29::1|Private Node|
-|dn42-uk-lon5.burble.dn42| |fd42:4242:2601:30::1|Private Node|
-|dn42-nl-ams1.burble.dn42| |fd42:4242:2601:33::1|Private Node|
+|uk-lon3.burble.dn42| |fd42:4242:2601:27::1|Private Node|
+|uk-lon4.burble.dn42| |fd42:4242:2601:29::1|Private Node|
+|nl-ams1.burble.dn42| |fd42:4242:2601:33::1|Private Node|
## burble.dn42 Nodes (Public Addressing)
@@ -86,8 +85,6 @@ IP address tables
|dn42-no-trd1.burble.com|217.168.87.226|2001:678:dd0:ffff::25|
|dn42-es-mad1.burble.com|45.132.74.100|2a0e:dc0:9:5::ab2d|
|dn42-ca-bhs2.burble.com|192.99.6.65|2607:5300:60:3741::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-dal3.burble.com|144.172.126.201|2602:fe64:8::4|
|dn42-us-lax1.burble.com|185.215.224.214|2a0b:ae40:1:4a0a::5a|
|dn42-sg-sin2.burble.com|139.99.89.157|2402:1f00:8000:800::3bc|
diff --git a/site/content/network/nodes.md b/site/content/network/nodes.md
index 9e77439..5150543 100644
--- a/site/content/network/nodes.md
+++ b/site/content/network/nodes.md
@@ -144,35 +144,3 @@ weight: 20
|**Tunnel IPv6 ULA**|fd42:4242:2601:23::1/128|
-## Older Nodes
-
-{{}}
-The following nodes are still active but are being decommissioned
-and are no longer open for new peerings.
-{{}}
-
-### dn42-us-nyc1
-|||
-|---|---|
-|**Location**|HostHatch, New York, United States|
-|**Public Hostname**|dn42-us-nyc1.burble.com|
-|{{}}**Decom. Date**{{}}|April 2021|
-|**Public IPv4 Address**|185.213.26.143|
-|**Public IPv6 Address**|2a0d:5600:33:b::1|
-|**Tunnel IPv4 Peer Address**|172.20.129.168/32|
-|**Tunnel IPv6 Link Local**|fe80::42:2601:34:1/64|
-|**Tunnel IPv6 ULA**|fd42:4242:2601:34::1/128|
-
-### dn42-us-chi1
-|||
-|---|---|
-|**Location**|HostHatch, Chicago, United States|
-|**Public Hostname**|dn42-us-chi1.burble.com|
-|{{}}**Decom. Date**{{}}|May 2021|
-|**Public IPv4 Address**|193.29.63.150|
-|**Public IPv6 Address**|2605:4840:3:10::ab2d|
-|**Tunnel IPv4 Peer Address**|172.20.129.166/32|
-|**Tunnel IPv6 Link Local**|fe80::42:2601:2e:1/64|
-|**Tunnel IPv6 ULA**|fd42:4242:2601:2e::1/128|
-
-
diff --git a/site/content/network/status.md b/site/content/network/status.md
index c6e7633..6bbd2b8 100644
--- a/site/content/network/status.md
+++ b/site/content/network/status.md
@@ -6,7 +6,7 @@ weight: 100
## Uptime Robot
-- https://dn42.status.burble.com/ (public internet link)
+- [https://stats.uptimerobot.com/l2913c0R6](https://stats.uptimerobot.com/l2913c0R6) (public internet link)
All nodes are monitored using [UptimeRobot](https://uptimerobot.com/).
diff --git a/site/content/services/public.md b/site/content/services/public.md
index 1685715..38545ff 100644
--- a/site/content/services/public.md
+++ b/site/content/services/public.md
@@ -82,7 +82,7 @@ The hosted grafana service has it's own page [here](/services/grafana).
### Uptime monitoring
-- [dn42.status.burble.com](https://dn42.status.burble.com/)
+- [https://stats.uptimerobot.com/l2913c0R6](https://stats.uptimerobot.com/l2913c0R6)
Each node in the network is monitored by [UptimeRobot](https://uptimerobot.com/) with alerts
if a node becomes unavailable.
@@ -135,7 +135,9 @@ Route Origin Authorisation (ROA) tables are generated using
The JSON output file can be used with [gortr](https://github.com/cloudflare/gortr)
to implement ROA checks via RPKI.
The Bird files can be used directly with Bird to implement ROA checks as detailed
-in the DN42 Wiki ([Bird1](https://dn42.net/howto/Bird) / [Bird2](https://dn42.net/howto/Bird2)).
+in the DN42 Wiki ([Bird1](https://dn42.net/howto/Bird) / [Bird2](https://dn42.net/howto/Bird2)).
+The OpenBGPD files can be used directly with OpenBGPD to implement ROA checks as details in the DN42 Wiki
+[OpenBGPD](https://dn42.dev/howto/OpenBGPD)
|URL| IPv4/IPv6 |Description|
|---|---|---|
@@ -146,6 +148,9 @@ in the DN42 Wiki ([Bird1](https://dn42.net/howto/Bird) / [Bird2](https://dn42.ne
|[https://dn42.burble.com/roa/dn42_roa_bird2_46.conf](https://dn42.burble.com/roa/dn42_roa_bird2_46.conf) | Both | DN42 ROA data for use with Bird2 |
|[https://dn42.burble.com/roa/dn42_roa_bird2_4.conf](https://dn42.burble.com/roa/dn42_roa_bird2_4.conf) | IPv4 Only | DN42 ROA data for use with Bird2 |
|[https://dn42.burble.com/roa/dn42_roa_bird2_6.conf](https://dn42.burble.com/roa/dn42_roa_bird2_6.conf) | IPv6 Only | DN42 ROA data for use with Bird2 |
+|[https://dn42.burble.com/roa/dn42_roa_obgpd_46.conf](https://dn42.burble.com/roa/dn42_roa_obgpd_46.conf) | Both | DN42 ROA data for use with OpenBGPD |
+|[https://dn42.burble.com/roa/dn42_roa_obgpd_4.conf](https://dn42.burble.com/roa/dn42_roa_obgpd_4.conf) | IPv4 Only | DN42 ROA data for use with OpenBGPD |
+|[https://dn42.burble.com/roa/dn42_roa_obgpd_6.conf](https://dn42.burble.com/roa/dn42_roa_obgpd_6.conf) | IPv6 Only | DN42 ROA data for use with OpenBGPD |
ROA data is cached via Cloudflare to provide fast local access, and an
[n8n](https://n8n.io) script is used to update ROA data immediately following