From cf5982ddd2010b24074a29b27982a9617d2ed1fb Mon Sep 17 00:00:00 2001 From: "Iain R. Learmonth" Date: Sat, 7 Mar 2020 18:03:20 +0000 Subject: [PATCH] Reshuffle and release some objects (IRL, ANA and ERG) * Release ERG specific resources, that experiment appears to be over * Repurpose AS-IRL resources for AS-ANA instead * Release objects for IPv6 addresses not-in-use * Adds GPG fingerprint for ANA-MNT * Moves Ana's domains onto her authoritative DNS server --- data/aut-num/AS4242421092 | 7 ------- data/aut-num/AS4242421096 | 10 +++++----- data/dns/acute.dn42 | 6 ++++++ data/dns/bin.dn42 | 2 +- data/dns/erg.dn42 | 7 ------- data/dns/pad.dn42 | 2 +- data/inet6num/fde0:5901:5bd7::_48 | 11 ----------- data/inetnum/172.20.152.0_23 | 11 +++++------ data/inetnum/172.20.204.0_27 | 9 --------- data/inetnum/172.20.204.32_28 | 9 --------- data/mntner/ANA-MNT | 1 + data/mntner/ERG-MNT | 6 ------ data/organisation/ORG-ERG | 7 ------- data/person/IRL-DN42 | 3 +-- data/route/172.20.152.0_23 | 4 ++-- data/route/172.20.204.0_27 | 5 ----- 16 files changed, 22 insertions(+), 78 deletions(-) delete mode 100644 data/aut-num/AS4242421092 create mode 100644 data/dns/acute.dn42 delete mode 100644 data/dns/erg.dn42 delete mode 100644 data/inet6num/fde0:5901:5bd7::_48 delete mode 100644 data/inetnum/172.20.204.0_27 delete mode 100644 data/inetnum/172.20.204.32_28 delete mode 100644 data/mntner/ERG-MNT delete mode 100644 data/organisation/ORG-ERG delete mode 100644 data/route/172.20.204.0_27 diff --git a/data/aut-num/AS4242421092 b/data/aut-num/AS4242421092 deleted file mode 100644 index f41733da6..000000000 --- a/data/aut-num/AS4242421092 +++ /dev/null @@ -1,7 +0,0 @@ -aut-num: AS4242421092 -as-name: AS-ERG -descr: Electronics Research Group Testbed -admin-c: IRL-DN42 -tech-c: IRL-DN42 -mnt-by: ERG-MNT -source: DN42 diff --git a/data/aut-num/AS4242421096 b/data/aut-num/AS4242421096 index a3edea892..7faf4e863 100644 --- a/data/aut-num/AS4242421096 +++ b/data/aut-num/AS4242421096 @@ -1,7 +1,7 @@ aut-num: AS4242421096 -as-name: AS-IRL -admin-c: IRL-DN42 -tech-c: IRL-DN42 -mnt-by: IRL-MNT -mnt-by: IRL-MNT +as-name: AS-ANA +admin-c: ANA-DN42 +tech-c: ANA-DN42 +mnt-by: ANA-MNT +mnt-by: ANA-MNT source: DN42 diff --git a/data/dns/acute.dn42 b/data/dns/acute.dn42 new file mode 100644 index 000000000..ea00f91df --- /dev/null +++ b/data/dns/acute.dn42 @@ -0,0 +1,6 @@ +domain: acute.dn42 +admin-c: ANA-DN42 +tech-c: ANA-DN42 +mnt-by: ANA-MNT +nserver: ns1.acute.dn42 172.20.153.53 +source: DN42 diff --git a/data/dns/bin.dn42 b/data/dns/bin.dn42 index 59a8924d8..3707bfb18 100644 --- a/data/dns/bin.dn42 +++ b/data/dns/bin.dn42 @@ -3,5 +3,5 @@ descr: pastebin admin-c: ANA-DN42 tech-c: ANA-DN42 mnt-by: ANA-MNT -nserver: ns1.flat.dn42 +nserver: ns1.acute.dn42 source: DN42 diff --git a/data/dns/erg.dn42 b/data/dns/erg.dn42 deleted file mode 100644 index 84bd4b67e..000000000 --- a/data/dns/erg.dn42 +++ /dev/null @@ -1,7 +0,0 @@ -domain: erg.dn42 -descr: Electronics Research Group -admin-c: IRL-DN42 -tech-c: IRL-DN42 -mnt-by: ERG-MNT -nserver: ns1.erg.dn42 172.20.152.2 -source: DN42 diff --git a/data/dns/pad.dn42 b/data/dns/pad.dn42 index 32a89824e..903215b1c 100644 --- a/data/dns/pad.dn42 +++ b/data/dns/pad.dn42 @@ -3,5 +3,5 @@ descr: etherpad admin-c: ANA-DN42 tech-c: ANA-DN42 mnt-by: ANA-MNT -nserver: ns1.flat.dn42 +nserver: ns1.acute.dn42 source: DN42 diff --git a/data/inet6num/fde0:5901:5bd7::_48 b/data/inet6num/fde0:5901:5bd7::_48 deleted file mode 100644 index e496f018d..000000000 --- a/data/inet6num/fde0:5901:5bd7::_48 +++ /dev/null @@ -1,11 +0,0 @@ -inet6num: fde0:5901:5bd7:0000:0000:0000:0000:0000 - fde0:5901:5bd7:ffff:ffff:ffff:ffff:ffff -netname: NET-ERG6 -descr: Electronics Research Group Testbed -country: GB -admin-c: IRL-DN42 -tech-c: IRL-DN42 -mnt-by: ERG-MNT -nserver: ns1.erg.dn42 -status: ASSIGNED -cidr: fde0:5901:5bd7::/48 -source: DN42 diff --git a/data/inetnum/172.20.152.0_23 b/data/inetnum/172.20.152.0_23 index 225a603ba..222a258f7 100644 --- a/data/inetnum/172.20.152.0_23 +++ b/data/inetnum/172.20.152.0_23 @@ -1,11 +1,10 @@ inetnum: 172.20.152.0 - 172.20.153.255 -netname: NET-ERG -descr: Electronics Research Group Testbed +netname: NET-ANA country: GB -admin-c: IRL-DN42 -tech-c: IRL-DN42 -mnt-by: ERG-MNT -nserver: ns1.erg.dn42 +admin-c: ANA-DN42 +tech-c: ANA-DN42 +mnt-by: ANA-MNT +nserver: ns1.acute.dn42 status: ASSIGNED cidr: 172.20.152.0/23 source: DN42 diff --git a/data/inetnum/172.20.204.0_27 b/data/inetnum/172.20.204.0_27 deleted file mode 100644 index b732bb553..000000000 --- a/data/inetnum/172.20.204.0_27 +++ /dev/null @@ -1,9 +0,0 @@ -inetnum: 172.20.204.0 - 172.20.204.31 -netname: IRL-NET -country: GB -admin-c: IRL-DN42 -tech-c: IRL-DN42 -mnt-by: IRL-MNT -status: ASSIGNED -cidr: 172.20.204.0/27 -source: DN42 diff --git a/data/inetnum/172.20.204.32_28 b/data/inetnum/172.20.204.32_28 deleted file mode 100644 index 7eee59468..000000000 --- a/data/inetnum/172.20.204.32_28 +++ /dev/null @@ -1,9 +0,0 @@ -inetnum: 172.20.204.32 - 172.20.204.47 -netname: IRL-DESK-NET -country: GB -admin-c: IRL-DN42 -tech-c: IRL-DN42 -mnt-by: IRL-MNT -status: ASSIGNED -cidr: 172.20.204.32/28 -source: DN42 diff --git a/data/mntner/ANA-MNT b/data/mntner/ANA-MNT index 52d4bca5c..793ac64ce 100644 --- a/data/mntner/ANA-MNT +++ b/data/mntner/ANA-MNT @@ -1,4 +1,5 @@ mntner: ANA-MNT +auth: pgp-fingerprint 85E7AAB8C29DF38349405DC06F8DE44D59D7DBCC admin-c: ANA-DN42 tech-c: ANA-DN42 mnt-by: ANA-MNT diff --git a/data/mntner/ERG-MNT b/data/mntner/ERG-MNT deleted file mode 100644 index 017ddf7ea..000000000 --- a/data/mntner/ERG-MNT +++ /dev/null @@ -1,6 +0,0 @@ -mntner: ERG-MNT -descr: Electronics Research Group -admin-c: IRL-DN42 -tech-c: IRL-DN42 -mnt-by: ERG-MNT -source: DN42 diff --git a/data/organisation/ORG-ERG b/data/organisation/ORG-ERG deleted file mode 100644 index 4bc6318c2..000000000 --- a/data/organisation/ORG-ERG +++ /dev/null @@ -1,7 +0,0 @@ -organisation: ORG-ERG -org-name: Electronics Research Group -www: https://erg.abdn.ac.uk/ -admin-c: IRL-DN42 -tech-c: IRL-DN42 -mnt-by: ERG-MNT -source: DN42 diff --git a/data/person/IRL-DN42 b/data/person/IRL-DN42 index bc45ee3f5..dc22c536d 100644 --- a/data/person/IRL-DN42 +++ b/data/person/IRL-DN42 @@ -1,6 +1,5 @@ person: irl contact: irl@shiftout.net -contact: xmpp:irl@jabber.fsfe.org nic-hdl: IRL-DN42 -mnt-by: ERG-MNT +mnt-by: IRL-MNT source: DN42 diff --git a/data/route/172.20.152.0_23 b/data/route/172.20.152.0_23 index 302c97664..2e4db1eb6 100644 --- a/data/route/172.20.152.0_23 +++ b/data/route/172.20.152.0_23 @@ -1,4 +1,4 @@ route: 172.20.152.0/23 -origin: AS4242421092 -mnt-by: ERG-MNT +origin: AS4242421096 +mnt-by: ANA-MNT source: DN42 diff --git a/data/route/172.20.204.0_27 b/data/route/172.20.204.0_27 deleted file mode 100644 index 32e8fcdf7..000000000 --- a/data/route/172.20.204.0_27 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.20.204.0/27 -descr: IRL-NET -origin: AS4242421096 -mnt-by: IRL-MNT -source: DN42