diff --git a/data/dns/ca.dn42 b/data/dns/ca.dn42 index e57f2684e..78bd94a31 100644 --- a/data/dns/ca.dn42 +++ b/data/dns/ca.dn42 @@ -5,5 +5,5 @@ tech-c: SOURIS-DN42 mnt-by: XUU-MNT nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 source: DN42 diff --git a/data/dns/dlv.dn42 b/data/dns/dlv.dn42 index 837253127..dbd33b98d 100644 --- a/data/dns/dlv.dn42 +++ b/data/dns/dlv.dn42 @@ -3,8 +3,8 @@ nserver: lavana.sjc.xuu.dn42 nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 nserver: kapha.mtr.xuu.dn42 -nserver: rishi.bre.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 +nserver: rakta.fra.xuu.dn42 admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/dns/dn42 b/data/dns/dn42 index e89b49654..056f617b9 100644 --- a/data/dns/dn42 +++ b/data/dns/dn42 @@ -3,8 +3,8 @@ nserver: lavana.sjc.xuu.dn42 172.22.141.181 nserver: lavana.sjc.xuu.dn42 fdea:a15a:77b9:4444::181 nserver: kapha.mtr.xuu.dn42 172.22.141.171 nserver: kapha.mtr.xuu.dn42 fdea:a15a:77b9:4444::171 -nserver: rishi.bre.xuu.dn42 172.22.141.191 -nserver: rishi.bre.xuu.dn42 fdea:a15a:77b9:4444::191 +nserver: rakta.fra.xuu.dn42 172.22.141.191 +nserver: rakta.fra.xuu.dn42 fdea:a15a:77b9:4444::191 nserver: grmml.root.dn42 172.23.149.20 nserver: grmml.root.dn42 fd42:23:149:cccc::53 org: ORG-DN42 diff --git a/data/dns/internal.dn42 b/data/dns/internal.dn42 index 7efaf3eff..fd34d0ed8 100644 --- a/data/dns/internal.dn42 +++ b/data/dns/internal.dn42 @@ -1,7 +1,7 @@ domain: internal.dn42 nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 nserver: ns1.grmml.dn42 nserver: ns2.grmml.dn42 nserver: ns3.grmml.dn42 diff --git a/data/dns/irc.dn42 b/data/dns/irc.dn42 index 2ef87c231..b609ef95d 100644 --- a/data/dns/irc.dn42 +++ b/data/dns/irc.dn42 @@ -9,6 +9,6 @@ mnt-by: STR-MNT mnt-by: MARLINC-MNT mnt-by: XUU-MNT mnt-by: TWINK0R-MNT -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 nserver: kapha.mtr.xuu.dn42 source: DN42 diff --git a/data/dns/martin89.dn42 b/data/dns/martin89.dn42 index 53526bcfb..31cb1d1c1 100644 --- a/data/dns/martin89.dn42 +++ b/data/dns/martin89.dn42 @@ -1,5 +1,6 @@ domain: martin89.dn42 -nserver: dns-anycast-a.martin89.dn42 172.22.113.12 +nserver: adns.martin89.dn42 172.22.113.12 +nserver: adns.martin89.dn42 fd42:64:713::12 admin-c: MARTIN89-DN42 tech-c: MARTIN89-DN42 mnt-by: DUMMY-MNT diff --git a/data/dns/mtn.dn42 b/data/dns/mtn.dn42 index 0283da65f..991a48aaf 100644 --- a/data/dns/mtn.dn42 +++ b/data/dns/mtn.dn42 @@ -5,5 +5,5 @@ tech-c: SOURIS-DN42 mnt-by: XUU-MNT nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 source: DN42 diff --git a/data/dns/nic.dn42 b/data/dns/nic.dn42 index 882124f19..8c4971891 100644 --- a/data/dns/nic.dn42 +++ b/data/dns/nic.dn42 @@ -5,5 +5,5 @@ tech-c: NIXNODES-DN42 mnt-by: NIXNODES-MNT nserver: kapha.mtr.xuu.dn42 nserver: lavnana.sjc.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 source: DN42 diff --git a/data/dns/nl-zuid.dn42 b/data/dns/nl-zuid.dn42 index 48c04894a..ac9e1163f 100644 --- a/data/dns/nl-zuid.dn42 +++ b/data/dns/nl-zuid.dn42 @@ -7,7 +7,7 @@ mnt-by: VHAL-MNT nserver: ns1.nl-zuid.dn42 172.23.23.228 nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 nserver: ns1.grmml.dn42 nserver: ns2.grmml.dn42 nserver: ns3.grmml.dn42 diff --git a/data/dns/registry.dn42 b/data/dns/registry.dn42 index 32da9310c..d21a95b32 100644 --- a/data/dns/registry.dn42 +++ b/data/dns/registry.dn42 @@ -5,5 +5,5 @@ tech-c: SOURIS-DN42 mnt-by: XUU-MNT nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 source: DN42 diff --git a/data/dns/root.dn42 b/data/dns/root.dn42 index c9f48eac7..7e1c5ee42 100644 --- a/data/dns/root.dn42 +++ b/data/dns/root.dn42 @@ -1,7 +1,7 @@ domain: root.dn42 nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 admin-c: DUMMY-DN42 tech-c: WELTERDE-DN42 tech-c: SISKA-DN42 diff --git a/data/dns/source.dn42 b/data/dns/source.dn42 index 717818fb7..1e33d19c1 100644 --- a/data/dns/source.dn42 +++ b/data/dns/source.dn42 @@ -5,5 +5,5 @@ tech-c: SOURIS-DN42 mnt-by: XUU-MNT nserver: kapha.mtr.xuu.dn42 nserver: lavana.sjc.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 source: DN42 diff --git a/data/dns/whois.dn42 b/data/dns/whois.dn42 index 2d2adcd62..32ee61a6a 100644 --- a/data/dns/whois.dn42 +++ b/data/dns/whois.dn42 @@ -1,6 +1,6 @@ domain: whois.dn42 nserver: lavana.sjc.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 nserver: kapha.mtr.xuu.dn42 mnt-by: XUU-MNT admin-c: SOURIS-DN42 diff --git a/data/dns/wiki.dn42 b/data/dns/wiki.dn42 index 2857380c9..21fd2b70f 100644 --- a/data/dns/wiki.dn42 +++ b/data/dns/wiki.dn42 @@ -1,7 +1,7 @@ domain: wiki.dn42 nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 -nserver: rishi.bre.xuu.dn42 +nserver: rakta.fra.xuu.dn42 nserver: ns1.grmml.dn42 nserver: ns2.grmml.dn42 nserver: ns3.grmml.dn42 diff --git a/data/dns/xuu.dn42 b/data/dns/xuu.dn42 index 8600c2957..9fe251c24 100644 --- a/data/dns/xuu.dn42 +++ b/data/dns/xuu.dn42 @@ -3,8 +3,8 @@ nserver: lavana.sjc.xuu.dn42 172.22.141.181 nserver: lavana.sjc.xuu.dn42 fdea:a15a:77b9:4444::181 nserver: kapha.mtr.xuu.dn42 172.22.141.171 nserver: kapha.mtr.xuu.dn42 fdea:a15a:77b9:4444::171 -nserver: rishi.bre.xuu.dn42 172.22.141.191 -nserver: rishi.bre.xuu.dn42 fdea:a15a:77b9:4444::191 +nserver: rakta.fra.xuu.dn42 172.22.141.191 +nserver: rakta.fra.xuu.dn42 fdea:a15a:77b9:4444::191 admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/inet6num/fd22:2697:498f::_48 b/data/inet6num/fd22:2697:498f::_48 deleted file mode 100644 index 61b79650d..000000000 --- a/data/inet6num/fd22:2697:498f::_48 +++ /dev/null @@ -1,10 +0,0 @@ -inet6num: fd22:2697:498f:0000:0000:0000:0000:0000 - fd22:2697:498f:ffff:ffff:ffff:ffff:ffff -netname: MARTIN89-DN42-IP6NET -descr: Martin89 dn42 network -admin-c: MARTIN89-DN42 -tech-c: MARTIN89-DN42 -status: ASSIGNED -nserver: a.dns.anycast.martin89.dn42 -cidr: fd22:2697:498f::/48 -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/inet6num/fd42:64:713::_48 b/data/inet6num/fd42:64:713::_48 index 5101875f9..92a061fa3 100644 --- a/data/inet6num/fd42:64:713::_48 +++ b/data/inet6num/fd42:64:713::_48 @@ -4,7 +4,7 @@ descr: Martin89 dn42 network admin-c: MARTIN89-DN42 tech-c: MARTIN89-DN42 status: ASSIGNED -nserver: a.dns.anycast.martin89.dn42 +nserver: adns.martin89.dn42 cidr: fd42:64:713::/48 mnt-by: MARTIN89-MNT source: DN42 diff --git a/data/inetnum/172.22.113.0_24 b/data/inetnum/172.22.113.0_24 index 8777a85c3..c7399b14a 100644 --- a/data/inetnum/172.22.113.0_24 +++ b/data/inetnum/172.22.113.0_24 @@ -4,7 +4,7 @@ descr: Martin89 dn42 network admin-c: MARTIN89-DN42 tech-c: MARTIN89-DN42 status: ASSIGNED -nserver: a.dns.anycast.martin89.dn42 +nserver: adns.martin89.dn42 cidr: 172.22.113.0/24 mnt-by: DUMMY-MNT source: DN42 diff --git a/data/mntner/MARTIN89-MNT b/data/mntner/MARTIN89-MNT index 375ba153d..cca52b996 100644 --- a/data/mntner/MARTIN89-MNT +++ b/data/mntner/MARTIN89-MNT @@ -1,6 +1,6 @@ mntner: MARTIN89-MNT descr: Martin89 -admin-c: DUMMY-DN42 -tech-c: DUMMY-DN42 +admin-c: MARTIN89-DN42 +tech-c: MARTIN89-DN42 mnt-by: MARTIN89-MNT source: DN42 diff --git a/data/person/MARTIN89-DN42 b/data/person/MARTIN89-DN42 index b2e76004b..cdcb4baed 100644 --- a/data/person/MARTIN89-DN42 +++ b/data/person/MARTIN89-DN42 @@ -1,6 +1,8 @@ person: Martin89 -e-mail: martin89@martin89.de +contact: martin89@martin89.de pgp-fingerprint: 45232747839B6CA8F33DDE6B438AF39A1DF9DEBB +contact: irc:Martin89@hackint +contact: xmpp:martin89@jabber.ccc.de nic-hdl: MARTIN89-DN42 mnt-by: DUMMY-MNT source: DN42 diff --git a/data/route6/fd42:64:713::_48 b/data/route6/fd42:64:713::_48 new file mode 100644 index 000000000..dba26720f --- /dev/null +++ b/data/route6/fd42:64:713::_48 @@ -0,0 +1,4 @@ +route6: fd42:64:713::/48 +origin: AS64713 +mnt-by: MARTIN89-MNT +source: DN42 diff --git a/data/tinc-key/MARTIN89-TINC b/data/tinc-key/MARTIN89-TINC deleted file mode 100644 index 752ce1795..000000000 --- a/data/tinc-key/MARTIN89-TINC +++ /dev/null @@ -1,24 +0,0 @@ -tinc-key: MARTIN89-TINC -tinc-host: martin89 -compression: 10 -subnet: 172.22.255.178/32 -subnet: fd04:de02:7af9:0:0:0:0:178/128 -tinc-address: 37.187.4.8 -port: 655 -admin-c: MARTIN89-DN42 -mnt-by: DUMMY-MNT -tinc-file: - Subnet = 172.22.255.178/32 - Subnet = fd04:de02:7af9:0:0:0:0:178/128 - Address = 37.187.4.8 - Port = 655 - Compression = 10 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAycIoGLOmpBTsHWsM7LHkM0pHRccHikVaEWrAMtPfFKuhzcUv2cWp - PC+r+EpqlFqCaTdVpm3ALMtZ32N0AcHo6tDqS5jfaBJe8j2IMmaISWzHjdHvLur1 - /Q4xEQdjdYihKLIETv3DbSbZjWSx/oIptVuoJS0dOjeIS07qYp1L5uvMARrC0qSj - KP0UQNbUyuaTIINaAApP+j7eJzU7JOAFblzBl3caY9QY1lRWxuawERYo6QTr5wmC - c3BFtWXWqez6JGmWrJhJJ5PbOMTW8WLDhqjiDJXlOjKW42Tp2yy3yILi5rEfu4+p - tXEsR+KIc1U0ecPH7JWUge9ts/vWQ7jYmQIDAQAB - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-keyset/SET-2-DN42-TINC b/data/tinc-keyset/SET-2-DN42-TINC index 5f41d38f5..8604bcae6 100644 --- a/data/tinc-keyset/SET-2-DN42-TINC +++ b/data/tinc-keyset/SET-2-DN42-TINC @@ -2,7 +2,6 @@ tinc-keyset: SET-2-DN42-TINC descr: dn42 tinc cloud #2 keyset remarks: tinc cloud with 172.22.255.176/28 member: VUTRAL-TINC -member: MARTIN89-TINC member: NOSPOONUSER-TINC member: DEELKAR-TINC member: STEPHANJ-TINC