From 9b8e0665fa97a5a8e6d235fb71c7e96b09bec386 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Wed, 21 Nov 2018 22:50:27 +0100 Subject: [PATCH] Rearrange attributes --- data/dns/dn42 | 13 ++----------- data/inet6num/fd00::_8 | 9 ++++----- data/inetnum/10.0.0.0_8 | 6 +++--- data/inetnum/172.20.0.0_16 | 12 +++--------- data/inetnum/172.21.0.0_16 | 13 ++++++------- data/inetnum/172.22.0.0_16 | 12 ++++-------- data/inetnum/172.23.0.0_16 | 10 ++++------ data/inetnum/172.31.0.0_16 | 13 ++++++------- 8 files changed, 32 insertions(+), 56 deletions(-) diff --git a/data/dns/dn42 b/data/dns/dn42 index edc4f5bd8..e89b49654 100644 --- a/data/dns/dn42 +++ b/data/dns/dn42 @@ -7,15 +7,6 @@ nserver: rishi.bre.xuu.dn42 172.22.141.191 nserver: rishi.bre.xuu.dn42 fdea:a15a:77b9:4444::191 nserver: grmml.root.dn42 172.23.149.20 nserver: grmml.root.dn42 fd42:23:149:cccc::53 -admin-c: DUMMY-DN42 -tech-c: WELTERDE-DN42 -tech-c: NIXNODES-DN42 -tech-c: SOURIS-DN42 -tech-c: GRMML-DN42 -mnt-by: NIXNODES-MNT -mnt-by: XUU-MNT -mnt-by: GRMML-MNT -mnt-by: PYROPETER-MNT -mnt-by: PRAUSCHER-MNT -mnt-by: HAX404-MNT +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inet6num/fd00::_8 b/data/inet6num/fd00::_8 index 67947a842..203ab8cd8 100644 --- a/data/inet6num/fd00::_8 +++ b/data/inet6num/fd00::_8 @@ -1,13 +1,12 @@ inet6num: fd00:0000:0000:0000:0000:0000:0000:0000 - fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff +cidr: fd00::/8 netname: ROOT-DN42-ULA descr: DN42 ULA Address Space -admin-c: DUMMY-DN42 -tech-c: DUMMY-DN42 -mnt-by: DUMMY-MNT +remarks: Only /48 prefixes may be allocated out of this range. nserver: lavana.sjc.xuu.dn42 nserver: grmml.root.dn42 status: ALLOCATED policy: open -remarks: Only /48 prefixes may be allocated out of this range. -cidr: fd00::/8 +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/10.0.0.0_8 b/data/inetnum/10.0.0.0_8 index 7ea150c1e..118006e9f 100644 --- a/data/inetnum/10.0.0.0_8 +++ b/data/inetnum/10.0.0.0_8 @@ -3,11 +3,11 @@ cidr: 10.0.0.0/8 netname: BLK-FREIFUNK descr: Freifunk Intercity-VPN remarks: Registry at https://github.com/freifunk/icvpn-meta -policy: closed -admin-c: HEXA-DN42 -mnt-by: HEXA-MNT nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 status: ALLOCATED +policy: closed +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.20.0.0_16 b/data/inetnum/172.20.0.0_16 index dccf695f8..4b808d548 100644 --- a/data/inetnum/172.20.0.0_16 +++ b/data/inetnum/172.20.0.0_16 @@ -4,14 +4,8 @@ netname: NET-BLK016-DN42 nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 -policy: reserved -admin-c: NIXNODES-DN42 -admin-c: SOURIS-DN42 -admin-c: GRMML-DN42 -admin-c: PRAUSCHER-DN42 -mnt-by: NIXNODES-MNT -mnt-by: XUU-MNT -mnt-by: GRMML-MNT -mnt-by: PRAUSCHER-MNT status: ALLOCATED +policy: reserved +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.21.0.0_16 b/data/inetnum/172.21.0.0_16 index acecc8d32..4c22ba344 100644 --- a/data/inetnum/172.21.0.0_16 +++ b/data/inetnum/172.21.0.0_16 @@ -1,14 +1,13 @@ inetnum: 172.21.0.0 - 172.21.255.255 +cidr: 172.21.0.0/16 netname: NET-BLK116-DN42 +remarks: * Last available IPv4 space +remarks: * Max one /24 per person only allowed due to shortages nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 -policy: reserved -remarks: * Last available IPv4 space -remarks: * Max one /24 per person only allowed due to shortages -admin-c: HEXA-DN42 -mnt-by: HEXA-MNT -mnt-by: NIXNODES-MNT status: ALLOCATED -cidr: 172.21.0.0/16 +policy: reserved +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.22.0.0_16 b/data/inetnum/172.22.0.0_16 index 2143a914b..6b228a0d7 100644 --- a/data/inetnum/172.22.0.0_16 +++ b/data/inetnum/172.22.0.0_16 @@ -2,16 +2,12 @@ inetnum: 172.22.0.0 - 172.22.255.255 cidr: 172.22.0.0/16 netname: NET-BLK216-DN42 descr: The original DN42 IPv4 address block. +remarks: Not free for direct assignments, please use sub-allocated blocks nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 -policy: reserved -remarks: Not free for direct assignments, please use sub-allocated blocks -admin-c: NIXNODES-DN42 -admin-c: SOURIS-DN42 -admin-c: GRMML-DN42 -mnt-by: NIXNODES-MNT -mnt-by: XUU-MNT -mnt-by: GRMML-MNT status: ALLOCATED +policy: reserved +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.23.0.0_16 b/data/inetnum/172.23.0.0_16 index aeb2772bc..4dd3042c5 100644 --- a/data/inetnum/172.23.0.0_16 +++ b/data/inetnum/172.23.0.0_16 @@ -2,14 +2,12 @@ inetnum: 172.23.0.0 - 172.23.255.255 cidr: 172.23.0.0/16 netname: NET-BLK316-DN42 descr: The secondary DN42 IPv4 address block. +remarks: Not free for direct assignments, please use sub-allocated blocks nserver: m.in-addr-servers.dn42 nserver: x.in-addr-servers.dn42 nserver: g.in-addr-servers.dn42 -policy: reserved -remarks: Not free for direct assignments, please use sub-allocated blocks -admin-c: NIXNODES-DN42 -admin-c: SOURIS-DN42 -mnt-by: NIXNODES-MNT -mnt-by: XUU-MNT status: ALLOCATED +policy: reserved +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42 diff --git a/data/inetnum/172.31.0.0_16 b/data/inetnum/172.31.0.0_16 index 283bbdb11..b80c59730 100644 --- a/data/inetnum/172.31.0.0_16 +++ b/data/inetnum/172.31.0.0_16 @@ -1,11 +1,10 @@ inetnum: 172.31.0.0 - 172.31.255.255 -remarks: ** chaosvpn -admin-c: DUMMY-DN42 -tech-c: DUMMY-DN42 -mnt-by: DN42-MNT -status: ALLOCATED +cidr: 172.31.0.0/16 +netname: ** chaosvpn nserver: ns1.chaosvpn.g.nic.dn42 nserver: ns2.chaosvpn.g.nic.dn42 -cidr: 172.31.0.0/16 -netname: Unnamed 172.31.0.0/16 Network +status: ALLOCATED +policy: closed +org: ORG-DN42 +mnt-by: DN42-MNT source: DN42