Merge branch 'master' of irl/registry into master

This commit is contained in:
burble 2020-03-08 09:28:28 +00:00 committed by kapha wiki
commit 0ecf743230
16 changed files with 22 additions and 78 deletions

View file

@ -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

View file

@ -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

6
data/dns/acute.dn42 Normal file
View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1,4 +1,5 @@
mntner: ANA-MNT
auth: pgp-fingerprint 85E7AAB8C29DF38349405DC06F8DE44D59D7DBCC
admin-c: ANA-DN42
tech-c: ANA-DN42
mnt-by: ANA-MNT

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1,4 +1,4 @@
route: 172.20.152.0/23
origin: AS4242421092
mnt-by: ERG-MNT
origin: AS4242421096
mnt-by: ANA-MNT
source: DN42

View file

@ -1,5 +0,0 @@
route: 172.20.204.0/27
descr: IRL-NET
origin: AS4242421096
mnt-by: IRL-MNT
source: DN42