From 486aecdc4123364fa2f57488c641a45a3ccacb11 Mon Sep 17 00:00:00 2001 From: Jon Lundy Date: Fri, 27 Oct 2017 20:31:41 +0000 Subject: [PATCH] update from registry --- data/aut-num/AS4242420037 | 4 ++-- data/aut-num/AS64712 | 16 ++++++++-------- data/aut-num/AS76143 | 4 ++-- data/aut-num/AS76198 | 8 ++++---- data/dns/020 | 1 - data/dns/0ae.dn42 | 1 - data/dns/0b101010.dn42 | 1 - data/dns/0l.dn42 | 1 - data/dns/23.dn42 | 1 - data/dns/2950.dn42 | 1 - data/dns/2f30.dn42 | 1 - data/dns/4242420321.dn42 | 1 - data/dns/9.dn42 | 1 - data/dns/AS4242422202.dn42 | 1 - data/dns/AS4242422506.dn42 | 1 - data/dns/CN.dn42 | 1 - data/dns/GIN42.dn42 | 1 - data/dns/HAELWENN.DN42 | 1 - data/dns/MATER.DN42 | 1 - data/dns/VBOX.DN42 | 1 - data/dns/VIRTIT.DN42 | 1 - data/dns/adm | 1 - data/dns/adnidor.dn42 | 1 - data/dns/alcatrash.dn42 | 1 - data/dns/allowed.dn42 | 1 - data/dns/analytics.dn42 | 1 - data/dns/aperture-laboratories.dn42 | 1 - data/dns/as4242420118.dn42 | 1 - data/dns/as4242420119.dn42 | 1 - data/dns/as4242420155.dn42 | 1 - data/dns/as4242420205.dn42 | 1 - data/dns/as4242420321.dn42 | 1 - data/dns/as4242420666.dn42 | 1 - data/dns/as4242420667.dn42 | 1 - data/dns/as4242422027.dn42 | 1 - data/dns/as4242429991.dn42 | 1 - data/dns/as64773.dn42 | 1 - data/dns/aseriesoftubez.dn42 | 1 - data/dns/asi.dn42 | 1 - data/dns/asot.dn42 | 1 - data/dns/assi.dn42 | 1 - data/dns/at.dn42 | 1 - data/dns/bandie.dn42 | 1 - data/dns/basilfillan.dn42 | 1 - data/dns/bin.dn42 | 1 - data/dns/bodems.dn42 | 1 - data/dns/br.dn42 | 1 - data/dns/brei.dn42 | 1 - data/dns/bt.dn42 | 1 - data/dns/cache.dn42 | 1 - data/dns/cccac.dn42 | 1 - data/dns/cccda.dn42 | 1 - data/dns/cda.dn42 | 1 - data/dns/certificatemonitor.dn42 | 1 - data/dns/challene.dn42 | 1 - data/dns/chaostreff.dn42 | 1 - data/dns/chelnok.dn42 | 1 - data/dns/chiantos.dn42 | 1 - data/dns/chuljin.dn42 | 1 - data/dns/codehack.dn42 | 1 - data/dns/coin.dn42 | 1 - data/dns/conrey.dn42 | 1 - data/dns/controlplane.dn42 | 1 - data/dns/cr.dn42 | 1 - data/dns/cs.dn42 | 1 - data/dns/dark-it.dn42 | 1 - data/dns/darkdna.dn42 | 1 - data/dns/darkfasel.dn42 | 1 - data/dns/dcpp.dn42 | 1 - data/dns/ddev.dn42 | 1 - data/dns/debiandev.dn42 | 1 - data/dns/deltaman.dn42 | 1 - data/dns/diemaco.dn42 | 1 - data/dns/dns.dn42 | 1 - data/dns/do-it-for.dn42 | 1 - data/dns/drathir.dn42 | 1 - data/dns/e-utp.dn42 | 1 - data/dns/erg.dn42 | 1 - data/dns/evenet.dn42 | 1 - data/dns/example.dn42 | 1 - data/dns/fablabberlin.dn42 | 1 - data/dns/fablabbln.dn42 | 1 - data/dns/face.dn42 | 1 - data/dns/fbnw.dn42 | 1 - data/dns/feuerrot.dn42 | 1 - data/dns/ff3l | 1 - data/dns/ffa | 1 - data/dns/ffac | 1 - data/dns/ffamt | 1 - data/dns/ffaw | 1 - data/dns/ffbcd | 1 - data/dns/ffbgl | 1 - data/dns/ffbin | 1 - data/dns/ffbit | 1 - data/dns/ffbo | 1 - data/dns/ffbsee | 1 - data/dns/ffc | 1 - data/dns/ffcux | 1 - data/dns/ffda.io | 1 - data/dns/ffdh | 1 - data/dns/ffdo | 1 - data/dns/ffdus | 1 - data/dns/ffe | 1 - data/dns/ffel | 1 - data/dns/ffen | 1 - data/dns/fferz | 1 - data/dns/ffeu | 1 - data/dns/fffd | 1 - data/dns/ffff | 1 - data/dns/ffffm | 1 - data/dns/fffl | 1 - data/dns/fffr | 1 - data/dns/ffge | 1 - data/dns/ffgl | 1 - data/dns/ffgoe | 1 - data/dns/ffgt | 1 - data/dns/ffh | 1 - data/dns/ffharz | 1 - data/dns/ffhb | 1 - data/dns/ffhgw | 1 - data/dns/ffhh | 1 - data/dns/ffhl | 1 - data/dns/ffhm | 1 - data/dns/ffhw | 1 - data/dns/ffi | 1 - data/dns/ffin | 1 - data/dns/ffj | 1 - data/dns/ffka | 1 - data/dns/ffki | 1 - data/dns/fflln | 1 - data/dns/fflux | 1 - data/dns/ffmee | 1 - data/dns/ffmo | 1 - data/dns/ffms | 1 - data/dns/ffmtl | 1 - data/dns/ffndh | 1 - data/dns/ffniers | 1 - data/dns/ffnord | 1 - data/dns/ffnw | 1 - data/dns/ffpb | 1 - data/dns/ffpi | 1 - data/dns/ffpr | 1 - data/dns/ffrade | 1 - data/dns/ffrg | 1 - data/dns/ffrgb | 1 - data/dns/ffrgw | 1 - data/dns/ffsaar | 1 - data/dns/ffsg | 1 - data/dns/ffsl | 1 - data/dns/ffstr | 1 - data/dns/ffsu | 1 - data/dns/fftdf | 1 - data/dns/fftr | 1 - data/dns/fftup | 1 - data/dns/fftut | 1 - data/dns/ffue | 1 - data/dns/ffulm | 1 - data/dns/ffvp | 1 - data/dns/ffw | 1 - data/dns/ffwdh | 1 - data/dns/ffweyher | 1 - data/dns/ffwk | 1 - data/dns/ffwp | 1 - data/dns/ffws | 1 - data/dns/flat.dn42 | 1 - data/dns/flb.dn42 | 1 - data/dns/fleaz.dn42 | 1 - data/dns/fleeb.dn42 | 1 - data/dns/fmie | 1 - data/dns/freifunk | 1 - data/dns/fritz.dn42 | 1 - data/dns/fsnx.dn42 | 1 - data/dns/gedix.dn42 | 1 - data/dns/gergernet.dn42 | 1 - data/dns/giga.dn42 | 1 - data/dns/gnilebein.dn42 | 1 - data/dns/googol.dn42 | 1 - data/dns/gotroot.dn42 | 1 - data/dns/grmml.dn42 | 1 - data/dns/gruetzkopf.dn42 | 1 - data/dns/gxa.dn42 | 1 - data/dns/gxanet.dn42 | 1 - data/dns/h4.hack | 1 - data/dns/hack | 1 - data/dns/halit.hack | 1 - data/dns/hax404.dn42 | 1 - data/dns/helgo | 1 - data/dns/herzog.dn42 | 1 - data/dns/icvpn | 1 - data/dns/io.dn42 | 1 - data/dns/ip.dn42 | 1 - data/dns/iutbeziers.dn42 | 1 - data/dns/ix.dn42 | 1 - data/dns/ixnet.dn42 | 1 - data/dns/j.dn42 | 1 - data/dns/jabber.dn42 | 1 - data/dns/jan.dn42 | 1 - data/dns/jgn.dn42 | 1 - data/dns/jmt.dn42 | 1 - data/dns/jomat.dn42 | 1 - data/dns/julez.dn42 | 1 - data/dns/kai-server.dn42 | 1 - data/dns/kai.cool | 1 - data/dns/kai.dn42 | 1 - data/dns/kaiflix.dn42 | 1 - data/dns/kingof.dn42 | 1 - data/dns/krstn.dn42 | 1 - data/dns/leroy.dn42 | 1 - data/dns/lf-net.dn42 | 1 - data/dns/lg.dn42 | 1 - data/dns/lhs.dn42 | 1 - data/dns/loaderror.dn42 | 1 - data/dns/localnet.dn42 | 1 - data/dns/luclu7.dn42 | 1 - data/dns/lutoma.dn42 | 1 - data/dns/lxnet.dn42 | 1 - data/dns/lynx.dn42 | 1 - data/dns/m33.dn42 | 1 - data/dns/macsbone.dn42 | 1 - data/dns/maglab.dn42 | 1 - data/dns/mail.dn42 | 1 - data/dns/major.dn42 | 1 - data/dns/maltejk.dn42 | 1 - data/dns/marlinc.dn42 | 1 - data/dns/media.dn42 | 1 - data/dns/mhm.dn42 | 1 - data/dns/miau.dn42 | 1 - data/dns/minkenetz.dn42 | 1 - data/dns/mirrors.dn42 | 1 - data/dns/moho.dn42 | 1 - data/dns/mortzu.dn42 | 1 - data/dns/mt.dn42 | 1 - data/dns/mueritz | 1 - data/dns/n.dn42 | 1 - data/dns/nasheed.dn42 | 1 - data/dns/nek0.dn42 | 1 - data/dns/neo.dn42 | 1 - data/dns/nerdinger.dn42 | 1 - data/dns/net.dn42 | 1 - data/dns/netblocks.dn42 | 1 - data/dns/netclipse.dn42 | 1 - data/dns/ngit.dn42 | 1 - data/dns/nic.dn42 | 1 - data/dns/nixnodes.dn42 | 1 - data/dns/nl-zuid.dn42 | 1 - data/dns/nobody44.dn42 | 1 - data/dns/nodauf.dn42 | 1 - data/dns/nop.dn42 | 1 - data/dns/noteblok.dn42 | 1 - data/dns/ntp.dn42 | 1 - data/dns/nullroute.dn42 | 1 - data/dns/ois.dn42 | 1 - data/dns/onion.dn42 | 1 - data/dns/overview.dn42 | 1 - data/dns/pad.dn42 | 1 - data/dns/pads.dn42 | 1 - data/dns/paste.dn42 | 1 - data/dns/pgp.dn42 | 1 - data/dns/picocloud.dn42 | 1 - data/dns/piston.dn42 | 1 - data/dns/pktsurf.dn42 | 1 - data/dns/plasmatrix.dn42 | 1 - data/dns/plumbus.dn42 | 1 - data/dns/pmenke.dn42 | 1 - data/dns/pppingme.dn42 | 1 - data/dns/pr0gramm.dn42 | 1 - data/dns/probsd.dn42 | 1 - data/dns/projectmori.dn42 | 1 - data/dns/prooops.dn42 | 1 - data/dns/proxity.dn42 | 1 - data/dns/purrdeta.dn42 | 1 - data/dns/qsx.dn42 | 1 - data/dns/raider.dn42 | 1 - data/dns/rbz.dn42 | 1 - data/dns/robbie.dn42 | 1 - data/dns/robotham.dn42 | 1 - data/dns/roelf.dn42 | 1 - data/dns/root6.dn42 | 1 - data/dns/rzl | 1 - data/dns/saintwolf.dn42 | 1 - data/dns/sapinet.dn42 | 1 - data/dns/saturn.dn42 | 1 - data/dns/sbg.dn42 | 1 - data/dns/sc.dn42 | 1 - data/dns/sebi.dn42 | 1 - data/dns/services.dn42 | 1 - data/dns/sidereal.dn42 | 1 - data/dns/sighup.dn42 | 1 - data/dns/sigterm.dn42 | 1 - data/dns/sin.dn42 | 1 - data/dns/skynet.dn42 | 1 - data/dns/sl.dn42 | 1 - data/dns/somnet.dn42 | 1 - data/dns/speedtest.dn42 | 1 - data/dns/splash.dn42 | 1 - data/dns/spreitzer.dn42 | 1 - data/dns/ssldecoder.dn42 | 1 - data/dns/storage.dn42 | 1 - data/dns/surf.dn42 | 1 - data/dns/syso.dn42 | 1 - data/dns/szf.dn42 | 1 - data/dns/tal.dn42 | 1 - data/dns/tbspace.dn42 | 1 - data/dns/tcc.dn42 | 1 - data/dns/tech9.dn42 | 1 - data/dns/tech9computers.dn42 | 1 - data/dns/test123.dn42 | 1 - data/dns/to.dn42 | 1 - data/dns/tombii.dn42 | 1 - data/dns/tor.dn42 | 1 - data/dns/torrent.dn42 | 1 - data/dns/torrents.dn42 | 1 - data/dns/tracker.dn42 | 1 - data/dns/trunet.dn42 | 1 - data/dns/tsys.dn42 | 1 - data/dns/ttygap.dn42 | 1 - data/dns/typhon.dn42 | 1 - data/dns/unbedenklich.dn42 | 1 - data/dns/unixbros.dn42 | 1 - data/dns/uu.dn42 | 1 - data/dns/vitalenetworks.dn42 | 1 - data/dns/voidptr.dn42 | 1 - data/dns/w0h.dn42 | 1 - data/dns/webtorrent.dn42 | 1 - data/dns/weiti.dn42 | 1 - data/dns/whatismyip.dn42 | 1 - data/dns/whatsmyip.dn42 | 1 - data/dns/whs.dn42 | 1 - data/dns/wieistmeineip.dn42 | 1 - data/dns/wolf.dn42 | 1 - data/dns/xiaoyu.dn42 | 1 - data/dns/xmpp.dn42 | 1 - data/dns/yacy.dn42 | 1 - data/dns/zeitgeist.dn42 | 1 - data/dns/zer0.dn42 | 1 - data/dns/znc.dn42 | 1 - data/organisation/ORG-C3D2 | 2 +- data/organisation/ORG-SIGTERM-NO-RIPE | 2 +- data/person/3DFXATWORK-DN42 | 1 - data/person/3STADT-DN42 | 1 - data/person/ADRA-DN42 | 1 - data/person/ALARIG-DN42 | 1 - data/person/ALICEWL-DN42 | 1 - data/person/ARENDTSEN-DN42 | 1 - data/person/BANDIE-DN42 | 1 - data/person/BDR-DN42 | 1 - data/person/BERKAY-DN42 | 1 - data/person/BR-DN42 | 1 - data/person/BYRN-DN42 | 1 - data/person/CAPS-DN42 | 1 - data/person/CATOFES-DN42 | 1 - data/person/CHALLENE-DN42 | 1 - data/person/CHRISMOOS-DN42 | 1 - data/person/CS1972-DN42 | 1 - data/person/CYCLOPTIVITY-DN42 | 1 - data/person/DARKIT-DN42 | 1 - data/person/DERF-DN42 | 1 - data/person/DOMINIKH-DN42 | 1 - data/person/DRACOLING-DN42 | 1 - data/person/ERI-DN42 | 1 - data/person/F0X-DN42 | 1 - data/person/FANIR-DN42 | 1 - data/person/FEUERROT-DN42 | 1 - data/person/FISIX-DN42 | 2 +- data/person/FOERTEL-DN42 | 1 - data/person/FPLETZ-DN42 | 1 - data/person/GBE-DN42 | 1 - data/person/GIGA-DN42 | 1 - data/person/GRMML-DN42 | 1 - data/person/HAX404-DN42 | 1 - data/person/HEJ-DN42 | 1 - data/person/HNRD-DN42 | 1 - data/person/HX-DN42 | 1 - data/person/ICECREAM-DN42 | 2 +- data/person/JAN-DN42 | 1 - data/person/JCIX-DN42 | 1 - data/person/JPLITZA-DN42 | 1 - data/person/LIFEHOME-DN42 | 1 - data/person/LOSTDERPWITCH-DN42 | 1 - data/person/LOSTNOC-DN42 | 1 - data/person/LUTOMA-DN42 | 1 - data/person/LYREX-DN42 | 1 - data/person/MARTIN89-DN42 | 1 - data/person/MIC92-DN42 | 1 - data/person/MIID-DN42 | 1 - data/person/MIN-DN42 | 1 - data/person/MINKE-DN42 | 1 - data/person/MINKENSTEIN-DN42 | 1 - data/person/MWHEELER-DN42 | 1 - data/person/NAZCO-DN42 | 1 - data/person/NICO-DN42 | 1 - data/person/NV2015-DN42 | 1 - data/person/OBBI-DN42 | 1 - data/person/OLEANDER-DN42 | 1 - data/person/PAULCDB-DN42 | 1 - data/person/PDOSTAL-DN42 | 1 - data/person/RAIDER-DN42 | 1 - data/person/REDBEARD-DN42 | 1 - data/person/RELROD-DN42 | 1 - data/person/RIPPERFOX-DN42 | 1 - data/person/ROELOFN-DN42 | 1 - data/person/RYAN-DN42 | 1 - data/person/SEBI-DN42 | 1 - data/person/SGNT-DN42 | 1 - data/person/SHEOGORATH-DN42 | 1 - data/person/SIDEREAL-DN42 | 1 - data/person/SIGTERM-DN42 | 2 +- data/person/SIN-DN42 | 1 - data/person/SISKA-DN42 | 3 +-- data/person/STV0G-DN42 | 1 - data/person/TATONKA-DN42 | 1 - data/person/TAZIDEN-DN42 | 1 - data/person/TBSPACE-DN42 | 1 - data/person/THB-DN42 | 1 - data/person/TLV-DN42 | 1 - data/person/TOBEE-DN42 | 1 - data/person/TOMBII-DN42 | 1 - data/person/TRRUNDE-DN42 | 1 - data/person/TRUNET-DN42 | 1 - data/person/TSYS-DN42 | 1 - data/person/TUXFLUX-DN42 | 1 - data/person/TXTFILE-DN42 | 1 - data/person/TYPHON-DN42 | 1 - data/person/W-DN42 | 2 +- data/person/W0H-DN42 | 1 - data/person/WEITI-DN42 | 1 - data/person/WHS-DN42 | 1 - data/person/WUNIX-DN42 | 1 - data/person/YANG-DN42 | 3 +-- data/person/YEGORG-DN42 | 3 +-- data/person/ZHSJ-DN42 | 1 - data/schema/AUT-NUM-SCHEMA | 10 +++++----- utils/schema-check/dn42-schema.py | 2 +- 433 files changed, 31 insertions(+), 452 deletions(-) diff --git a/data/aut-num/AS4242420037 b/data/aut-num/AS4242420037 index 8fb6dc054..c66414eeb 100644 --- a/data/aut-num/AS4242420037 +++ b/data/aut-num/AS4242420037 @@ -1,8 +1,8 @@ aut-num: AS4242420037 as-name: FLONET-SITE1-AS descr: FLONET home1 AS -import: from AS4242420037:AS-FLONET accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -export: to AS4242420037:AS-FLONET announce { 172.22.104.0/25^+, 172.22.125.0/25, 172.23.123.0/24, 172.23.220.0/24, 172.22.159.0/24 } +x-import: from AS4242420037:AS-FLONET accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +x-export: to AS4242420037:AS-FLONET announce { 172.22.104.0/25^+, 172.22.125.0/25, 172.23.123.0/24, 172.23.220.0/24, 172.22.159.0/24 } remarks: This is the Main AS-NUM Object remarks: == Peerings == remarks: transit only AS diff --git a/data/aut-num/AS64712 b/data/aut-num/AS64712 index 4a2f46d64..8714a6b66 100644 --- a/data/aut-num/AS64712 +++ b/data/aut-num/AS64712 @@ -1,19 +1,19 @@ aut-num: AS64712 as-name: FRITZ-AS remarks: Transit from AS76115 -import: from AS76115 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -export: to AS76115 announce { 172.22.40.0/23, 172.22.58.0/24, 172.22.119.128/26, 172.23.192.0/24 } +x-import: from AS76115 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +x-export: to AS76115 announce { 172.22.40.0/23, 172.22.58.0/24, 172.22.119.128/26, 172.23.192.0/24 } mp-import: afi ipv6 from AS76115 accept { fc00::/7^+ } mp-export: afi ipv6 to AS76115 announce { fdb3:d376:9939::/48 } remarks: Transit from AS4242423759 -import: from AS4242423759 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -export: to AS4343433759 announce { 172.22.40.0/23, 172.22.58.0/24, 172.22.119.128/26, 172.23.192.0/24 } +x-import: from AS4242423759 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +x-export: to AS4343433759 announce { 172.22.40.0/23, 172.22.58.0/24, 172.22.119.128/26, 172.23.192.0/24 } remarks: Transit from AS4242423843 -import: from AS4242423843 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -export: to AS4242423843 announce { 172.22.40.0/23, 172.22.58.0/24, 172.22.119.128/26, 172.23.192.0/24 } +x-import: from AS4242423843 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +x-export: to AS4242423843 announce { 172.22.40.0/23, 172.22.58.0/24, 172.22.119.128/26, 172.23.192.0/24 } remarks: Transit for AS76198 -import: from AS76198 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -export: to AS76198 announce { 172.16.0.0/12^+, 10.0.0.0/8^+ } +x-import: from AS76198 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +x-export: to AS76198 announce { 172.16.0.0/12^+, 10.0.0.0/8^+ } mp-import: afi ipv6 from AS76198 accept { fc00::/7^+ } mp-export: afi ipv6 from AS76198 announce { fc00::/7^+ } admin-c: FRITZ-DN42 diff --git a/data/aut-num/AS76143 b/data/aut-num/AS76143 index 209b5ae8c..97213c52b 100644 --- a/data/aut-num/AS76143 +++ b/data/aut-num/AS76143 @@ -1,8 +1,8 @@ aut-num: AS76143 as-name: FLONET-SITE1-AS descr: FLONET home1 AS -import: from AS76143:AS-FLONET accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -export: to AS76143:AS-FLONET announce { 172.22.104.0/25^+, 172.22.125.0/25, 172.23.123.0/24, 172.23.220.0/24, 172.22.159.0/24 } +x-import: from AS76143:AS-FLONET accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +x-export: to AS76143:AS-FLONET announce { 172.22.104.0/25^+, 172.22.125.0/25, 172.23.123.0/24, 172.23.220.0/24, 172.22.159.0/24 } remarks: This is the Main AS-NUM Object remarks: == Peerings == remarks: transit only AS diff --git a/data/aut-num/AS76198 b/data/aut-num/AS76198 index b603ee1d4..48a9e0440 100644 --- a/data/aut-num/AS76198 +++ b/data/aut-num/AS76198 @@ -6,14 +6,14 @@ remarks: Welcome to the DN42 autonomous system of Fablab Bremen and remarks: Chaos Computer Club Bremen. We have an open peering policy. remarks: ------------------------ remarks: Transit from AS64712 -import: from AS64712 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -export: to AS64712 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } +x-import: from AS64712 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +x-export: to AS64712 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } mp-import: afi ipv6 from AS64712 accept { fc00::/7^+ } mp-export: afi ipv6 to AS64712 announce { fdd6:aff6:5f6f::/48 } remarks: ------------------------ remarks: Transit from AS76115 -import: from AS76115 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -export: to AS76115 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } +x-import: from AS76115 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +x-export: to AS76115 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } mp-import: afi ipv6 from AS76115 accept { fc00::/7^+ } mp-export: afi ipv6 to AS76115 announce { fdd6:aff6:5f6f::/48 } admin-c: FRITZ-DN42 diff --git a/data/dns/020 b/data/dns/020 index 96f3996ad..920caa145 100644 --- a/data/dns/020 +++ b/data/dns/020 @@ -1,5 +1,4 @@ domain: 020 -country: DE remarks: ** amsterdam admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/0ae.dn42 b/data/dns/0ae.dn42 index f3c0836a6..0d8300340 100644 --- a/data/dns/0ae.dn42 +++ b/data/dns/0ae.dn42 @@ -1,5 +1,4 @@ domain: 0ae.dn42 -country: US admin-c: SODRE-DN42 tech-c: SODRE-DN42 mnt-by: SODRE-MNT diff --git a/data/dns/0b101010.dn42 b/data/dns/0b101010.dn42 index 30d0c2fca..4cc428460 100644 --- a/data/dns/0b101010.dn42 +++ b/data/dns/0b101010.dn42 @@ -1,5 +1,4 @@ domain: 0b101010.dn42 -country: GB admin-c: B101010-DN42 tech-c: B101010-DN42 mnt-by: B101010-MNT diff --git a/data/dns/0l.dn42 b/data/dns/0l.dn42 index 3dbcc5e9a..043131f4b 100644 --- a/data/dns/0l.dn42 +++ b/data/dns/0l.dn42 @@ -1,6 +1,5 @@ domain: 0l.dn42 descr: /dev/nulll dns -country: DE admin-c: STV0G-DN42 tech-c: STV0G-DN42 mnt-by: NULLL-MNT diff --git a/data/dns/23.dn42 b/data/dns/23.dn42 index e331cf0c2..b91051792 100644 --- a/data/dns/23.dn42 +++ b/data/dns/23.dn42 @@ -1,5 +1,4 @@ domain: 23.dn42 -country: US nserver: ns1.nixnodes.dn42 nserver: ns2.nixnodes.dn42 status: EVALPEND 1503915395 diff --git a/data/dns/2950.dn42 b/data/dns/2950.dn42 index ad6328dcb..2ca933364 100644 --- a/data/dns/2950.dn42 +++ b/data/dns/2950.dn42 @@ -1,5 +1,4 @@ domain: 2950.dn42 -country: DE admin-c: CR-DN42 tech-c: CR-DN42 mnt-by: SIS-ORG-MNT diff --git a/data/dns/2f30.dn42 b/data/dns/2f30.dn42 index ece08acb3..95bdb15de 100644 --- a/data/dns/2f30.dn42 +++ b/data/dns/2f30.dn42 @@ -1,6 +1,5 @@ domain: 2f30.dn42 descr: 2f30 domain -country: NL admin-c: SIN-DN42 tech-c: SIN-DN42 mnt-by: 2F30-MNT diff --git a/data/dns/4242420321.dn42 b/data/dns/4242420321.dn42 index 061d2d690..365f6ac35 100644 --- a/data/dns/4242420321.dn42 +++ b/data/dns/4242420321.dn42 @@ -1,6 +1,5 @@ domain: 4242420321.dn42 descr: 4242420321 -country: SE admin-c: TOMBII-DN42 tech-c: TOMBII-DN42 mnt-by: TOMBII-DN42-MNT diff --git a/data/dns/9.dn42 b/data/dns/9.dn42 index 08c35030d..bb0fefbd0 100644 --- a/data/dns/9.dn42 +++ b/data/dns/9.dn42 @@ -1,6 +1,5 @@ domain: 9.dn42 descr: TECH9 -country: US admin-c: CHRISMOOS-DN42 tech-c: CHRISMOOS-DN42 mnt-by: TECH9-MNT diff --git a/data/dns/AS4242422202.dn42 b/data/dns/AS4242422202.dn42 index 2372e7cee..a0be42a16 100644 --- a/data/dns/AS4242422202.dn42 +++ b/data/dns/AS4242422202.dn42 @@ -1,5 +1,4 @@ domain: AS4242422202.dn42 -country: DE admin-c: JULEZ-DN42 tech-c: JULEZ-DN42 mnt-by: JULEZ-MNT diff --git a/data/dns/AS4242422506.dn42 b/data/dns/AS4242422506.dn42 index 5171147f0..511cb0fb3 100644 --- a/data/dns/AS4242422506.dn42 +++ b/data/dns/AS4242422506.dn42 @@ -1,6 +1,5 @@ domain: AS4242422506.dn42 descr: my AS domain for LG -country: HK admin-c: KAI-DN42 tech-c: KAI-DN42 mnt-by: KAI-MNT diff --git a/data/dns/CN.dn42 b/data/dns/CN.dn42 index 92a843a2d..b24c3e7d9 100644 --- a/data/dns/CN.dn42 +++ b/data/dns/CN.dn42 @@ -1,6 +1,5 @@ domain: CN.dn42 descr: xiaoyu-net -country: US admin-c: XIAOYU-DN42 tech-c: XIAOYU-DN42 mnt-by: XIAOYU-MNT diff --git a/data/dns/GIN42.dn42 b/data/dns/GIN42.dn42 index 4db503afb..09cd979e7 100644 --- a/data/dns/GIN42.dn42 +++ b/data/dns/GIN42.dn42 @@ -1,5 +1,4 @@ domain: GIN42.dn42 -country: DE admin-c: GIN42-DN42 tech-c: GIN42-DN42 mnt-by: GIN42-MNT diff --git a/data/dns/HAELWENN.DN42 b/data/dns/HAELWENN.DN42 index 5afad7e2c..bc25f653f 100644 --- a/data/dns/HAELWENN.DN42 +++ b/data/dns/HAELWENN.DN42 @@ -1,5 +1,4 @@ domain: HAELWENN.DN42 -country: FR admin-c: HAELWENN-DN42 tech-c: HAELWENN-DN42 mnt-by: HAELWENN-MNT diff --git a/data/dns/MATER.DN42 b/data/dns/MATER.DN42 index 1f90d2d3d..d26185052 100644 --- a/data/dns/MATER.DN42 +++ b/data/dns/MATER.DN42 @@ -1,6 +1,5 @@ domain: MATER.DN42 descr: Mater Net -country: US admin-c: MATER-DN42 tech-c: MATER-DN42 mnt-by: MATER-MNT diff --git a/data/dns/VBOX.DN42 b/data/dns/VBOX.DN42 index 6e3fb81f8..86791e00f 100644 --- a/data/dns/VBOX.DN42 +++ b/data/dns/VBOX.DN42 @@ -1,5 +1,4 @@ domain: VBOX.DN42 -country: GB admin-c: VBOX-DN42 tech-c: VBOX-DN42 mnt-by: VBOX-MNT diff --git a/data/dns/VIRTIT.DN42 b/data/dns/VIRTIT.DN42 index 9fcb04b45..e737bdc3e 100644 --- a/data/dns/VIRTIT.DN42 +++ b/data/dns/VIRTIT.DN42 @@ -1,5 +1,4 @@ domain: VIRTIT.DN42 -country: PT admin-c: MIGUELMONTEIRO-DN42 tech-c: MIGUELMONTEIRO-DN42 mnt-by: VIRTIT-MNT diff --git a/data/dns/adm b/data/dns/adm index 5913c5e1e..862023f5e 100644 --- a/data/dns/adm +++ b/data/dns/adm @@ -1,5 +1,4 @@ domain: adm -country: DE remarks: ** amsterdam admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/adnidor.dn42 b/data/dns/adnidor.dn42 index 67c9f6479..3717530bd 100644 --- a/data/dns/adnidor.dn42 +++ b/data/dns/adnidor.dn42 @@ -1,5 +1,4 @@ domain: adnidor.dn42 -country: DE admin-c: ADNIDOR-DN42 tech-c: ADNIDOR-DN42 mnt-by: ADNIDOR-MNT diff --git a/data/dns/alcatrash.dn42 b/data/dns/alcatrash.dn42 index 0a2a19763..39e60e145 100644 --- a/data/dns/alcatrash.dn42 +++ b/data/dns/alcatrash.dn42 @@ -1,6 +1,5 @@ domain: alcatrash.dn42 descr: MichaelTrip DNS - Alcatrash -country: NL admin-c: MTR-DN42 tech-c: MTR-DN42 mnt-by: MTR-MNT diff --git a/data/dns/allowed.dn42 b/data/dns/allowed.dn42 index 951ee171e..67d72214e 100644 --- a/data/dns/allowed.dn42 +++ b/data/dns/allowed.dn42 @@ -1,5 +1,4 @@ domain: allowed.dn42 -country: US nserver: ns1.allowed.dn42 172.23.11.1 admin-c: EPOCH-DN42 tech-c: EPOCH-DN42 diff --git a/data/dns/analytics.dn42 b/data/dns/analytics.dn42 index 342c52b0a..d9aef433b 100644 --- a/data/dns/analytics.dn42 +++ b/data/dns/analytics.dn42 @@ -1,6 +1,5 @@ domain: analytics.dn42 descr: Analytics domain -country: NL admin-c: TRUNET-DN42 tech-c: TRUNET-DN42 mnt-by: TRUNET-MNT diff --git a/data/dns/aperture-laboratories.dn42 b/data/dns/aperture-laboratories.dn42 index 6b18594e7..000563cc1 100644 --- a/data/dns/aperture-laboratories.dn42 +++ b/data/dns/aperture-laboratories.dn42 @@ -1,5 +1,4 @@ domain: aperture-laboratories.dn42 -country: NL admin-c: REWBYCRAFT-DN42 tech-c: REWBYCRAFT-DN42 mnt-by: REWBYSOFT-MNT diff --git a/data/dns/as4242420118.dn42 b/data/dns/as4242420118.dn42 index a5a5d5546..b30165814 100644 --- a/data/dns/as4242420118.dn42 +++ b/data/dns/as4242420118.dn42 @@ -5,4 +5,3 @@ mnt-by: JRB0001-MNT nserver: ns.as4242420119.dn42 nserver: ns.as4242420119.dn42 status: EVALPEND 1503915576 -country: CH diff --git a/data/dns/as4242420119.dn42 b/data/dns/as4242420119.dn42 index 815656841..ff695c47f 100644 --- a/data/dns/as4242420119.dn42 +++ b/data/dns/as4242420119.dn42 @@ -5,4 +5,3 @@ mnt-by: JRB0001-MNT nserver: ns.as4242420119.dn42 172.21.64.97 nserver: ns.as4242420119.dn42 fd42:5d71:219:1::1 status: EVALPEND 1503915606 -country: CH diff --git a/data/dns/as4242420155.dn42 b/data/dns/as4242420155.dn42 index ff3213ebc..fae66cf38 100644 --- a/data/dns/as4242420155.dn42 +++ b/data/dns/as4242420155.dn42 @@ -1,6 +1,5 @@ domain: as4242420155.dn42 descr: as4242420155 infpage -country: DE admin-c: NLDDEV1-DN42 tech-c: NLDDEV1-DN42 mnt-by: DDEV-MNT diff --git a/data/dns/as4242420205.dn42 b/data/dns/as4242420205.dn42 index ab8c9459c..4ee0715d5 100644 --- a/data/dns/as4242420205.dn42 +++ b/data/dns/as4242420205.dn42 @@ -1,5 +1,4 @@ domain: as4242420205.dn42 -country: DE admin-c: ROOT6-DN42 tech-c: ROOT6-DN42 mnt-by: ROOT6-MNT diff --git a/data/dns/as4242420321.dn42 b/data/dns/as4242420321.dn42 index 459b38981..295bac197 100644 --- a/data/dns/as4242420321.dn42 +++ b/data/dns/as4242420321.dn42 @@ -1,6 +1,5 @@ domain: as4242420321.dn42 descr: 4242420321 -country: SE admin-c: TOMBII-DN42 tech-c: TOMBII-DN42 mnt-by: TOMBII-DN42-MNT diff --git a/data/dns/as4242420666.dn42 b/data/dns/as4242420666.dn42 index bda5edef7..708595ac6 100644 --- a/data/dns/as4242420666.dn42 +++ b/data/dns/as4242420666.dn42 @@ -1,6 +1,5 @@ domain: as4242420666.dn42 descr: as4242420666 domain -country: DE admin-c: SZF-DN42 tech-c: SZF-DN42 mnt-by: SZF-MNT diff --git a/data/dns/as4242420667.dn42 b/data/dns/as4242420667.dn42 index d4987cac7..8bba40153 100644 --- a/data/dns/as4242420667.dn42 +++ b/data/dns/as4242420667.dn42 @@ -1,6 +1,5 @@ domain: as4242420667.dn42 descr: as4242420667 domain -country: DE admin-c: SZF-DN42 tech-c: SZF-DN42 mnt-by: SZF-MNT diff --git a/data/dns/as4242422027.dn42 b/data/dns/as4242422027.dn42 index fb861f458..360c208d6 100644 --- a/data/dns/as4242422027.dn42 +++ b/data/dns/as4242422027.dn42 @@ -1,5 +1,4 @@ domain: as4242422027.dn42 -country: CA admin-c: RDBCN-DN42 tech-c: RDBCN-DN42 mnt-by: RDBCN-MNT diff --git a/data/dns/as4242429991.dn42 b/data/dns/as4242429991.dn42 index 396260b44..d22ba47c6 100644 --- a/data/dns/as4242429991.dn42 +++ b/data/dns/as4242429991.dn42 @@ -1,6 +1,5 @@ domain: as4242429991.dn42 descr: Vitale Netowks ASN -country: NL org: ORG-VITALE admin-c: SCARLET-DN42 tech-c: SCARLET-DN42 diff --git a/data/dns/as64773.dn42 b/data/dns/as64773.dn42 index fd8e0e9df..9784240b8 100644 --- a/data/dns/as64773.dn42 +++ b/data/dns/as64773.dn42 @@ -1,6 +1,5 @@ domain: as64773.dn42 descr: as64773.dn42 -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/aseriesoftubez.dn42 b/data/dns/aseriesoftubez.dn42 index 7d2d3790e..66d1f7569 100644 --- a/data/dns/aseriesoftubez.dn42 +++ b/data/dns/aseriesoftubez.dn42 @@ -1,6 +1,5 @@ domain: aseriesoftubez.dn42 descr: A Series of Tubez Networks -country: CA admin-c: HEAVYMETAL-DN42 tech-c: HEAVYMETAL-DN42 mnt-by: ASOTNET-MNT diff --git a/data/dns/asi.dn42 b/data/dns/asi.dn42 index 17c3578cb..37d0da9ce 100644 --- a/data/dns/asi.dn42 +++ b/data/dns/asi.dn42 @@ -1,6 +1,5 @@ domain: asi.dn42 descr: asi.dn42 -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/asot.dn42 b/data/dns/asot.dn42 index 7e1c523f3..94782b813 100644 --- a/data/dns/asot.dn42 +++ b/data/dns/asot.dn42 @@ -1,6 +1,5 @@ domain: asot.dn42 descr: A Series of Tubez Networks -country: CA admin-c: HEAVYMETAL-DN42 tech-c: HEAVYMETAL-DN42 mnt-by: ASOTNET-MNT diff --git a/data/dns/assi.dn42 b/data/dns/assi.dn42 index a9b916955..3bc1acba3 100644 --- a/data/dns/assi.dn42 +++ b/data/dns/assi.dn42 @@ -1,6 +1,5 @@ domain: assi.dn42 descr: assi.dn42 -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/at.dn42 b/data/dns/at.dn42 index ff0d25790..19d2432e0 100644 --- a/data/dns/at.dn42 +++ b/data/dns/at.dn42 @@ -1,6 +1,5 @@ domain: at.dn42 descr: at -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/bandie.dn42 b/data/dns/bandie.dn42 index d671d5f9e..c4e81db2a 100644 --- a/data/dns/bandie.dn42 +++ b/data/dns/bandie.dn42 @@ -1,5 +1,4 @@ domain: bandie.dn42 -country: DE admin-c: BANDIE-DN42 tech-c: BANDIE-DN42 mnt-by: BANDIE-MNT diff --git a/data/dns/basilfillan.dn42 b/data/dns/basilfillan.dn42 index 45dfcdeca..77b6ae9e2 100644 --- a/data/dns/basilfillan.dn42 +++ b/data/dns/basilfillan.dn42 @@ -1,6 +1,5 @@ domain: basilfillan.dn42 descr: Basil Fillan -country: GB admin-c: BASIL-DN42 tech-c: BASIL-DN42 mnt-by: BASIL-MNT diff --git a/data/dns/bin.dn42 b/data/dns/bin.dn42 index d2b92f59a..e12a04b0c 100644 --- a/data/dns/bin.dn42 +++ b/data/dns/bin.dn42 @@ -1,6 +1,5 @@ domain: bin.dn42 descr: pastebin -country: GB admin-c: ANA-DN42 tech-c: ANA-DN42 mnt-by: ANA-MNT diff --git a/data/dns/bodems.dn42 b/data/dns/bodems.dn42 index a3e9f62d9..525110e44 100644 --- a/data/dns/bodems.dn42 +++ b/data/dns/bodems.dn42 @@ -3,7 +3,6 @@ nserver: ns1.bodems.dn42 172.23.146.42 nserver: ns1.bodems.dn42 fdef:c0f:fe:1337::42 nserver: ns0.bodems.dn42 172.23.146.68 nserver: ns0.bodems.dn42 fdef:c0f:fe:100:20d:b9ff:fe35:3aec -country: DE admin-c: BODEMS-DN42 tech-c: BODEMS-DN42 mnt-by: BODEMS-MNT diff --git a/data/dns/br.dn42 b/data/dns/br.dn42 index 237b12f7f..462cd34aa 100644 --- a/data/dns/br.dn42 +++ b/data/dns/br.dn42 @@ -1,6 +1,5 @@ domain: br.dn42 descr: br.dn42 -country: BR admin-c: BR-DN42 tech-c: BR-DN42 mnt-by: BR-MNT diff --git a/data/dns/brei.dn42 b/data/dns/brei.dn42 index 1821f99bd..28025cd90 100644 --- a/data/dns/brei.dn42 +++ b/data/dns/brei.dn42 @@ -1,5 +1,4 @@ domain: brei.dn42 -country: DE admin-c: CR-DN42 tech-c: CR-DN42 mnt-by: SIS-ORG-MNT diff --git a/data/dns/bt.dn42 b/data/dns/bt.dn42 index 54a7e697d..f344d62ae 100644 --- a/data/dns/bt.dn42 +++ b/data/dns/bt.dn42 @@ -1,6 +1,5 @@ domain: bt.dn42 descr: xiaoyu-net -country: US admin-c: XIAOYU-DN42 tech-c: XIAOYU-DN42 mnt-by: XIAOYU-MNT diff --git a/data/dns/cache.dn42 b/data/dns/cache.dn42 index 5881ea357..b780eadb4 100644 --- a/data/dns/cache.dn42 +++ b/data/dns/cache.dn42 @@ -1,6 +1,5 @@ domain: cache.dn42 descr: Global Anycast CDN for dn42 -country: US admin-c: CHARLESTHESLOTH-DN42 tech-c: CHARLESTHESLOTH-DN42 mnt-by: SLOTHLOGISTICS-MNT diff --git a/data/dns/cccac.dn42 b/data/dns/cccac.dn42 index a0a34f21d..39cb47a31 100644 --- a/data/dns/cccac.dn42 +++ b/data/dns/cccac.dn42 @@ -1,6 +1,5 @@ domain: cccac.dn42 descr: Domain des CCC Aachens -country: DE admin-c: ND-DN42 tech-c: ND-DN42 mnt-by: ND-MNT diff --git a/data/dns/cccda.dn42 b/data/dns/cccda.dn42 index 11382cf55..8bbcbbc66 100644 --- a/data/dns/cccda.dn42 +++ b/data/dns/cccda.dn42 @@ -1,6 +1,5 @@ domain: cccda.dn42 descr: CCC Darmstadt -country: DE admin-c: HEXA-DN42 tech-c: HEXA-DN42 mnt-by: HEXA-MNT diff --git a/data/dns/cda.dn42 b/data/dns/cda.dn42 index ec790eb49..697791e9b 100644 --- a/data/dns/cda.dn42 +++ b/data/dns/cda.dn42 @@ -1,6 +1,5 @@ domain: cda.dn42 descr: http://darmstadt.ccc.de -country: DE org: ORG-CCCDA admin-c: HEXA-DN42 tech-c: HEXA-DN42 diff --git a/data/dns/certificatemonitor.dn42 b/data/dns/certificatemonitor.dn42 index 6ead36601..f920f4f71 100644 --- a/data/dns/certificatemonitor.dn42 +++ b/data/dns/certificatemonitor.dn42 @@ -1,6 +1,5 @@ domain: certificatemonitor.dn42 descr: certificatemonitor -country: DE admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/challene.dn42 b/data/dns/challene.dn42 index e89cfd5c0..ab28c9cda 100644 --- a/data/dns/challene.dn42 +++ b/data/dns/challene.dn42 @@ -1,6 +1,5 @@ domain: challene.dn42 descr: challene -country: SG admin-c: CHALLENE-DN42 tech-c: CHALLENE-DN42 mnt-by: CHALLENE-MNT diff --git a/data/dns/chaostreff.dn42 b/data/dns/chaostreff.dn42 index 118b10a01..86d15bb83 100644 --- a/data/dns/chaostreff.dn42 +++ b/data/dns/chaostreff.dn42 @@ -1,6 +1,5 @@ domain: chaostreff.dn42 descr: Chaostreffs -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/chelnok.dn42 b/data/dns/chelnok.dn42 index 3138cb14f..f23afdb7c 100644 --- a/data/dns/chelnok.dn42 +++ b/data/dns/chelnok.dn42 @@ -1,6 +1,5 @@ domain: chelnok.dn42 descr: chelnok community -country: DE admin-c: ERI-DN42 tech-c: ERI-DN42 mnt-by: ERI-MNT diff --git a/data/dns/chiantos.dn42 b/data/dns/chiantos.dn42 index 3c792b80c..8c1a9aff3 100644 --- a/data/dns/chiantos.dn42 +++ b/data/dns/chiantos.dn42 @@ -1,6 +1,5 @@ domain: chiantos.dn42 descr: Chiantos Main Domain -country: FR nserver: haruhi.chiantos.dn42 172.23.147.225 admin-c: KANKAN-DN42 tech-c: KANKAN-DN42 diff --git a/data/dns/chuljin.dn42 b/data/dns/chuljin.dn42 index 066859a7a..9b2510c56 100644 --- a/data/dns/chuljin.dn42 +++ b/data/dns/chuljin.dn42 @@ -1,6 +1,5 @@ domain: chuljin.dn42 admin-c: CHULJIN-DN42 -country: US tech-c: CHULJIN-DN42 mnt-by: CHULJIN-MNT nserver: ns1.chuljin.dn42 172.20.248.45 diff --git a/data/dns/codehack.dn42 b/data/dns/codehack.dn42 index 534723cb8..e8e8ff979 100644 --- a/data/dns/codehack.dn42 +++ b/data/dns/codehack.dn42 @@ -1,5 +1,4 @@ domain: codehack.dn42 -country: CN admin-c: CODEHACK-DN42 tech-c: CODEHACK-DN42 mnt-by: CODEHACK-MNT diff --git a/data/dns/coin.dn42 b/data/dns/coin.dn42 index d63575cf5..0bdd380c2 100644 --- a/data/dns/coin.dn42 +++ b/data/dns/coin.dn42 @@ -1,6 +1,5 @@ domain: coin.dn42 descr: The first payment solution in DN42! -country: GB admin-c: KAI-DN42 org: ORG-COIN tech-c: KAI-DN42 diff --git a/data/dns/conrey.dn42 b/data/dns/conrey.dn42 index 7a5efa4e9..77ff4336f 100644 --- a/data/dns/conrey.dn42 +++ b/data/dns/conrey.dn42 @@ -1,6 +1,5 @@ domain: conrey.dn42 descr: as4242420526 -country: US admin-c: CONREY-DN42 tech-c: CONREY-DN42 mnt-by: CONREY-MNT diff --git a/data/dns/controlplane.dn42 b/data/dns/controlplane.dn42 index 72a6139b6..58900233c 100644 --- a/data/dns/controlplane.dn42 +++ b/data/dns/controlplane.dn42 @@ -1,6 +1,5 @@ domain: controlplane.dn42 descr: controlplane.de in dn42 network -country: DE admin-c: CONTROLPLANE-DN42 tech-c: CONTROLPLANE-DN42 mnt-by: CONTROLPLANE-MNT diff --git a/data/dns/cr.dn42 b/data/dns/cr.dn42 index d685b5d38..992c0ea3e 100644 --- a/data/dns/cr.dn42 +++ b/data/dns/cr.dn42 @@ -1,5 +1,4 @@ domain: cr.dn42 -country: DE admin-c: CR-DN42 tech-c: CR-DN42 mnt-by: SIS-ORG-MNT diff --git a/data/dns/cs.dn42 b/data/dns/cs.dn42 index 552642b8d..64b022c42 100644 --- a/data/dns/cs.dn42 +++ b/data/dns/cs.dn42 @@ -1,6 +1,5 @@ domain: cs.dn42 descr: Chaos Salzburg -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/dark-it.dn42 b/data/dns/dark-it.dn42 index d5871a248..e019cd1a4 100644 --- a/data/dns/dark-it.dn42 +++ b/data/dns/dark-it.dn42 @@ -1,6 +1,5 @@ domain: dark-it.dn42 admin-c: DARKIT-DN42 -country: DE tech-c: DARKIT-DN42 mnt-by: DARKIT-MNT nserver: ns1.dark-it.dn42 172.23.245.1 diff --git a/data/dns/darkdna.dn42 b/data/dns/darkdna.dn42 index 940109399..36b8c66ee 100644 --- a/data/dns/darkdna.dn42 +++ b/data/dns/darkdna.dn42 @@ -1,6 +1,5 @@ domain: darkdna.dn42 descr: DarkDNA -country: US admin-c: PURRDETA-DN42 tech-c: PURRDETA-DN42 mnt-by: PURRDETA-MNT diff --git a/data/dns/darkfasel.dn42 b/data/dns/darkfasel.dn42 index 54b47590d..a7c1a2648 100644 --- a/data/dns/darkfasel.dn42 +++ b/data/dns/darkfasel.dn42 @@ -1,6 +1,5 @@ domain: darkfasel.dn42 descr: darkfasel -country: NL admin-c: ARGV-DN42 tech-c: ARGV-DN42 mnt-by: ARGV-DN42-MNT diff --git a/data/dns/dcpp.dn42 b/data/dns/dcpp.dn42 index d561d6d38..4aa2fe43e 100644 --- a/data/dns/dcpp.dn42 +++ b/data/dns/dcpp.dn42 @@ -1,6 +1,5 @@ domain: dcpp.dn42 descr: direct connect on dn42 -country: DE admin-c: GRMML-DN42 tech-c: GRMML-DN42 mnt-by: GRMML-MNT diff --git a/data/dns/ddev.dn42 b/data/dns/ddev.dn42 index 269757ad7..998e35aa4 100644 --- a/data/dns/ddev.dn42 +++ b/data/dns/ddev.dn42 @@ -1,6 +1,5 @@ domain: ddev.dn42 descr: dn42 ns by debiandev -country: DE admin-c: NLDDEV1-DN42 tech-c: NLDDEV1-DN42 mnt-by: DDEV-MNT diff --git a/data/dns/debiandev.dn42 b/data/dns/debiandev.dn42 index 91e4cbaba..26a79821c 100644 --- a/data/dns/debiandev.dn42 +++ b/data/dns/debiandev.dn42 @@ -1,6 +1,5 @@ domain: debiandev.dn42 descr: debiandev webpage -country: DE admin-c: NLDDEV1-DN42 tech-c: NLDDEV1-DN42 mnt-by: DDEV-MNT diff --git a/data/dns/deltaman.dn42 b/data/dns/deltaman.dn42 index e9f30292c..498de6b3b 100644 --- a/data/dns/deltaman.dn42 +++ b/data/dns/deltaman.dn42 @@ -1,6 +1,5 @@ domain: deltaman.dn42 descr: General Deltaman domain -country: NL admin-c: DELTAMAN-DN42 tech-c: DELTAMAN-DN42 mnt-by: DELTAMAN-MNT diff --git a/data/dns/diemaco.dn42 b/data/dns/diemaco.dn42 index 176ecb0b4..866ce0b7c 100644 --- a/data/dns/diemaco.dn42 +++ b/data/dns/diemaco.dn42 @@ -1,6 +1,5 @@ domain: diemaco.dn42 descr: dns entry -country: CA admin-c: DIEMACO-DN42 tech-c: DIEMACO-DN42 mnt-by: DIEMACO-MNT diff --git a/data/dns/dns.dn42 b/data/dns/dns.dn42 index 272ce30bb..1c305f3d7 100644 --- a/data/dns/dns.dn42 +++ b/data/dns/dns.dn42 @@ -1,6 +1,5 @@ domain: dns.dn42 descr: DNS PROJECT -country: SE admin-c: TOMBII-DN42 tech-c: TOMBII-DN42 mnt-by: TOMBII-DN42-MNT diff --git a/data/dns/do-it-for.dn42 b/data/dns/do-it-for.dn42 index 4821b4061..713d5ddc0 100644 --- a/data/dns/do-it-for.dn42 +++ b/data/dns/do-it-for.dn42 @@ -1,5 +1,4 @@ domain: do-it-for.dn42 -country: NL admin-c: REWBYCRAFT-DN42 tech-c: REWBYCRAFT-DN42 mnt-by: REWBYSOFT-MNT diff --git a/data/dns/drathir.dn42 b/data/dns/drathir.dn42 index b19923999..c34471249 100644 --- a/data/dns/drathir.dn42 +++ b/data/dns/drathir.dn42 @@ -1,5 +1,4 @@ domain: drathir.dn42 -country: FR admin-c: DRATHIR-DN42 tech-c: DRATHIR-DN42 mnt-by: DRATHIR-MNT diff --git a/data/dns/e-utp.dn42 b/data/dns/e-utp.dn42 index 0d7d816b8..b8618be31 100644 --- a/data/dns/e-utp.dn42 +++ b/data/dns/e-utp.dn42 @@ -1,6 +1,5 @@ domain: e-utp.dn42 descr: Drixter -country: PL admin-c: DRIXTER-DN42 nserver: ns1.e-utp.dn42 172.22.165.50 tech-c: DRIXTER-DN42 diff --git a/data/dns/erg.dn42 b/data/dns/erg.dn42 index c178f53f0..d79f44e9c 100644 --- a/data/dns/erg.dn42 +++ b/data/dns/erg.dn42 @@ -1,6 +1,5 @@ domain: erg.dn42 descr: Electronics Research Group -country: GB admin-c: IRL-DN42 tech-c: IRL-DN42 mnt-by: ERG-MNT diff --git a/data/dns/evenet.dn42 b/data/dns/evenet.dn42 index 7d40277da..86a9d09d3 100644 --- a/data/dns/evenet.dn42 +++ b/data/dns/evenet.dn42 @@ -1,6 +1,5 @@ domain: evenet.dn42 descr: evenet domain -country: DE admin-c: MIC92-DN42 tech-c: MIC92-DN42 mnt-by: MIC92-MNT diff --git a/data/dns/example.dn42 b/data/dns/example.dn42 index 8a888377c..8d6d86090 100644 --- a/data/dns/example.dn42 +++ b/data/dns/example.dn42 @@ -1,5 +1,4 @@ domain: example.dn42 -country: DE admin-c: KRSTN-DN42 tech-c: KRSTN-DN42 mnt-by: KRSTN-MNT diff --git a/data/dns/fablabberlin.dn42 b/data/dns/fablabberlin.dn42 index a0f29ad98..a69c9ad0b 100644 --- a/data/dns/fablabberlin.dn42 +++ b/data/dns/fablabberlin.dn42 @@ -1,5 +1,4 @@ domain: fablabberlin.dn42 -country: DE admin-c: SYSOFABLAB-DN42 tech-c: SYSOFABLAB-DN42 mnt-by: FABLABBERLIN-MNT diff --git a/data/dns/fablabbln.dn42 b/data/dns/fablabbln.dn42 index 36aedc946..444a57a45 100644 --- a/data/dns/fablabbln.dn42 +++ b/data/dns/fablabbln.dn42 @@ -1,5 +1,4 @@ domain: fablabbln.dn42 -country: DE admin-c: SYSOFABLAB-DN42 tech-c: SYSOFABLAB-DN42 mnt-by: FABLABBERLIN-MNT diff --git a/data/dns/face.dn42 b/data/dns/face.dn42 index 75959a390..f8623af02 100644 --- a/data/dns/face.dn42 +++ b/data/dns/face.dn42 @@ -1,6 +1,5 @@ domain: face.dn42 descr: xiaoyu-net -country: US admin-c: XIAOYU-DN42 tech-c: XIAOYU-DN42 mnt-by: XIAOYU-MNT diff --git a/data/dns/fbnw.dn42 b/data/dns/fbnw.dn42 index 25a6d8f65..88d73c2ee 100644 --- a/data/dns/fbnw.dn42 +++ b/data/dns/fbnw.dn42 @@ -1,6 +1,5 @@ domain: fbnw.dn42 descr: FBNW Networks -country: AT admin-c: FBNW-DN42 tech-c: FBNW-DN42 mnt-by: FLORIANB-MNT diff --git a/data/dns/feuerrot.dn42 b/data/dns/feuerrot.dn42 index 9ef09ac2e..11b38d1fb 100644 --- a/data/dns/feuerrot.dn42 +++ b/data/dns/feuerrot.dn42 @@ -1,5 +1,4 @@ domain: feuerrot.dn42 -country: DE admin-c: FEUERROT-DN42 tech-c: FEUERROT-DN42 mnt-by: FEUERROT-MNT diff --git a/data/dns/ff3l b/data/dns/ff3l index 98a55a760..dfede6a63 100644 --- a/data/dns/ff3l +++ b/data/dns/ff3l @@ -1,5 +1,4 @@ domain: ff3l -country: DE remarks: ** dreilaendereck admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffa b/data/dns/ffa index 315e53ca9..7f19b1b16 100644 --- a/data/dns/ffa +++ b/data/dns/ffa @@ -1,5 +1,4 @@ domain: ffa -country: DE remarks: ** augsburg admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffac b/data/dns/ffac index 467f9fab0..091d8d062 100644 --- a/data/dns/ffac +++ b/data/dns/ffac @@ -1,5 +1,4 @@ domain: ffac -country: DE remarks: ** aachen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffamt b/data/dns/ffamt index 4351fe0f4..7912f4cc3 100644 --- a/data/dns/ffamt +++ b/data/dns/ffamt @@ -1,5 +1,4 @@ domain: ffamt -country: DE remarks: ** altmuehltal admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffaw b/data/dns/ffaw index 904e8f011..9c1f19d23 100644 --- a/data/dns/ffaw +++ b/data/dns/ffaw @@ -1,5 +1,4 @@ domain: ffaw -country: DE remarks: ** suedwest admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffbcd b/data/dns/ffbcd index 71e964715..930204880 100644 --- a/data/dns/ffbcd +++ b/data/dns/ffbcd @@ -1,5 +1,4 @@ domain: ffbcd -country: DE remarks: ** glwupper admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffbgl b/data/dns/ffbgl index 209a36339..927f75889 100644 --- a/data/dns/ffbgl +++ b/data/dns/ffbgl @@ -1,5 +1,4 @@ domain: ffbgl -country: DE remarks: ** glwupper admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffbin b/data/dns/ffbin index b3f20738f..448a357a8 100644 --- a/data/dns/ffbin +++ b/data/dns/ffbin @@ -1,5 +1,4 @@ domain: ffbin -country: DE remarks: ** bingen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffbit b/data/dns/ffbit index 71ae2acf4..14648c16e 100644 --- a/data/dns/ffbit +++ b/data/dns/ffbit @@ -1,5 +1,4 @@ domain: ffbit -country: DE remarks: ** bitburg admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffbo b/data/dns/ffbo index 8bc4be7b7..d20986593 100644 --- a/data/dns/ffbo +++ b/data/dns/ffbo @@ -1,5 +1,4 @@ domain: ffbo -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffbsee b/data/dns/ffbsee index 29b3b7b71..48939b0dc 100644 --- a/data/dns/ffbsee +++ b/data/dns/ffbsee @@ -1,5 +1,4 @@ domain: ffbsee -country: DE remarks: ** bodensee admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffc b/data/dns/ffc index 6b6511336..2abb4e79b 100644 --- a/data/dns/ffc +++ b/data/dns/ffc @@ -1,5 +1,4 @@ domain: ffc -country: DE remarks: ** chemnitz admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffcux b/data/dns/ffcux index 3cfbce68e..7338f5f57 100644 --- a/data/dns/ffcux +++ b/data/dns/ffcux @@ -1,5 +1,4 @@ domain: ffcux -country: DE remarks: ** cuxhaven admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffda.io b/data/dns/ffda.io index 1e3e03b27..ca1fa58da 100644 --- a/data/dns/ffda.io +++ b/data/dns/ffda.io @@ -1,5 +1,4 @@ domain: ffda.io -country: DE remarks: ** darmstadt admin-c: HEXA-DN42 tech-c: HEXA-DN42 diff --git a/data/dns/ffdh b/data/dns/ffdh index 4fc8201dd..86a88a65c 100644 --- a/data/dns/ffdh +++ b/data/dns/ffdh @@ -1,5 +1,4 @@ domain: ffdh -country: DE remarks: ** diepholz admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffdo b/data/dns/ffdo index 3d0d00409..3b0dd2e56 100644 --- a/data/dns/ffdo +++ b/data/dns/ffdo @@ -1,5 +1,4 @@ domain: ffdo -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffdus b/data/dns/ffdus index 74b983806..a516a64cd 100644 --- a/data/dns/ffdus +++ b/data/dns/ffdus @@ -1,5 +1,4 @@ domain: ffdus -country: DE remarks: ** flingern admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffe b/data/dns/ffe index a3e3819c5..2931d3660 100644 --- a/data/dns/ffe +++ b/data/dns/ffe @@ -1,5 +1,4 @@ domain: ffe -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffel b/data/dns/ffel index 503060a67..02edd10dc 100644 --- a/data/dns/ffel +++ b/data/dns/ffel @@ -1,5 +1,4 @@ domain: ffel -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffen b/data/dns/ffen index 5091d3775..cd9d85f26 100644 --- a/data/dns/ffen +++ b/data/dns/ffen @@ -1,5 +1,4 @@ domain: ffen -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fferz b/data/dns/fferz index 7679ad9df..f7fd9171f 100644 --- a/data/dns/fferz +++ b/data/dns/fferz @@ -1,5 +1,4 @@ domain: fferz -country: DE remarks: ** erzgebirge admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffeu b/data/dns/ffeu index 0f565acfc..146b1279b 100644 --- a/data/dns/ffeu +++ b/data/dns/ffeu @@ -1,5 +1,4 @@ domain: ffeu -country: DE remarks: ** euskirchen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fffd b/data/dns/fffd index 656102751..960ad5c10 100644 --- a/data/dns/fffd +++ b/data/dns/fffd @@ -1,5 +1,4 @@ domain: fffd -country: DE remarks: ** fulda admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffff b/data/dns/ffff index 94a6c1146..5943b975f 100644 --- a/data/dns/ffff +++ b/data/dns/ffff @@ -1,5 +1,4 @@ domain: ffff -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffffm b/data/dns/ffffm index c3a8bb8c7..4f4fdea0e 100644 --- a/data/dns/ffffm +++ b/data/dns/ffffm @@ -1,5 +1,4 @@ domain: ffffm -country: DE remarks: ** frankfurt admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fffl b/data/dns/fffl index 7a34d3bc6..3e10b4dad 100644 --- a/data/dns/fffl +++ b/data/dns/fffl @@ -1,5 +1,4 @@ domain: fffl -country: DE remarks: ** flensburg admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fffr b/data/dns/fffr index 52417d99f..7fd564652 100644 --- a/data/dns/fffr +++ b/data/dns/fffr @@ -1,5 +1,4 @@ domain: fffr -country: DE remarks: ** freiburg admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffge b/data/dns/ffge index 5dc468f6b..96e014304 100644 --- a/data/dns/ffge +++ b/data/dns/ffge @@ -1,5 +1,4 @@ domain: ffge -country: DE remarks: ** gelsenkirchen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffgl b/data/dns/ffgl index 516dc0824..f409a31f3 100644 --- a/data/dns/ffgl +++ b/data/dns/ffgl @@ -1,5 +1,4 @@ domain: ffgl -country: DE remarks: ** glwupper admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffgoe b/data/dns/ffgoe index bae118762..74edce8af 100644 --- a/data/dns/ffgoe +++ b/data/dns/ffgoe @@ -1,5 +1,4 @@ domain: ffgoe -country: DE remarks: ** goettingen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffgt b/data/dns/ffgt index a939f37ba..1340c9ddc 100644 --- a/data/dns/ffgt +++ b/data/dns/ffgt @@ -1,5 +1,4 @@ domain: ffgt -country: DE remarks: ** guetersloh admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffh b/data/dns/ffh index 52a733b51..034a0507c 100644 --- a/data/dns/ffh +++ b/data/dns/ffh @@ -1,5 +1,4 @@ domain: ffh -country: DE remarks: ** hannover admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffharz b/data/dns/ffharz index f93e4f1bd..9fa02549d 100644 --- a/data/dns/ffharz +++ b/data/dns/ffharz @@ -1,5 +1,4 @@ domain: ffharz -country: DE remarks: ** harz admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffhb b/data/dns/ffhb index 8d8c7c987..ff0271dae 100644 --- a/data/dns/ffhb +++ b/data/dns/ffhb @@ -1,5 +1,4 @@ domain: ffhb -country: DE remarks: ** bremen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffhgw b/data/dns/ffhgw index d4c025fd2..0b8101908 100644 --- a/data/dns/ffhgw +++ b/data/dns/ffhgw @@ -1,5 +1,4 @@ domain: ffhgw -country: DE remarks: ** greifswald admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffhh b/data/dns/ffhh index d1fc4b986..52433ac17 100644 --- a/data/dns/ffhh +++ b/data/dns/ffhh @@ -1,5 +1,4 @@ domain: ffhh -country: DE remarks: ** hamburg admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffhl b/data/dns/ffhl index ded590741..c8a8d13d4 100644 --- a/data/dns/ffhl +++ b/data/dns/ffhl @@ -1,5 +1,4 @@ domain: ffhl -country: DE remarks: ** luebeck admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffhm b/data/dns/ffhm index 8e89e8db7..65b421bc4 100644 --- a/data/dns/ffhm +++ b/data/dns/ffhm @@ -1,5 +1,4 @@ domain: ffhm -country: DE remarks: ** hameln admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffhw b/data/dns/ffhw index 9d5b2437d..cf7fc82d6 100644 --- a/data/dns/ffhw +++ b/data/dns/ffhw @@ -1,5 +1,4 @@ domain: ffhw -country: DE remarks: ** hueckeswagen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffi b/data/dns/ffi index 39c90d96c..2f590b63c 100644 --- a/data/dns/ffi +++ b/data/dns/ffi @@ -1,5 +1,4 @@ domain: ffi -country: DE remarks: ** hannover admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffin b/data/dns/ffin index 4cc4db9a8..c5513bbc0 100644 --- a/data/dns/ffin +++ b/data/dns/ffin @@ -1,5 +1,4 @@ domain: ffin -country: DE remarks: ** ingolstadt admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffj b/data/dns/ffj index ca5244fb8..a381687ca 100644 --- a/data/dns/ffj +++ b/data/dns/ffj @@ -1,5 +1,4 @@ domain: ffj -country: DE remarks: ** jena admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffka b/data/dns/ffka index 7efe497c3..8e2fc9c16 100644 --- a/data/dns/ffka +++ b/data/dns/ffka @@ -1,5 +1,4 @@ domain: ffka -country: DE remarks: ** karlsruhe admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffki b/data/dns/ffki index c4a22b092..a85f14547 100644 --- a/data/dns/ffki +++ b/data/dns/ffki @@ -1,5 +1,4 @@ domain: ffki -country: DE remarks: ** kiel admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fflln b/data/dns/fflln index 0d223e0a2..7bafc7de4 100644 --- a/data/dns/fflln +++ b/data/dns/fflln @@ -1,5 +1,4 @@ domain: fflln -country: DE remarks: ** leichlingen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fflux b/data/dns/fflux index fa885d1fb..b8f60378d 100644 --- a/data/dns/fflux +++ b/data/dns/fflux @@ -1,5 +1,4 @@ domain: fflux -country: DE remarks: ** luxembourg admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffmee b/data/dns/ffmee index 03076bf47..bf5821314 100644 --- a/data/dns/ffmee +++ b/data/dns/ffmee @@ -1,5 +1,4 @@ domain: ffmee -country: DE remarks: ** meerane admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffmo b/data/dns/ffmo index ab7b535b4..b37bf7ea4 100644 --- a/data/dns/ffmo +++ b/data/dns/ffmo @@ -1,5 +1,4 @@ domain: ffmo -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffms b/data/dns/ffms index 341ec85cf..06b5f92d0 100644 --- a/data/dns/ffms +++ b/data/dns/ffms @@ -1,5 +1,4 @@ domain: ffms -country: DE remarks: ** muensterland admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffmtl b/data/dns/ffmtl index 01c1e15c5..eb1432b96 100644 --- a/data/dns/ffmtl +++ b/data/dns/ffmtl @@ -1,5 +1,4 @@ domain: ffmtl -country: DE remarks: ** mittelsachsen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffndh b/data/dns/ffndh index 5a9d5912f..ef729ec0a 100644 --- a/data/dns/ffndh +++ b/data/dns/ffndh @@ -1,5 +1,4 @@ domain: ffndh -country: DE remarks: ** nordheide admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffniers b/data/dns/ffniers index 051220eb0..fb1ba6b5f 100644 --- a/data/dns/ffniers +++ b/data/dns/ffniers @@ -1,5 +1,4 @@ domain: ffniers -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffnord b/data/dns/ffnord index 6f0686ada..f224ff906 100644 --- a/data/dns/ffnord +++ b/data/dns/ffnord @@ -1,5 +1,4 @@ domain: ffnord -country: DE remarks: ** nord admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffnw b/data/dns/ffnw index 734848891..26848f741 100644 --- a/data/dns/ffnw +++ b/data/dns/ffnw @@ -1,5 +1,4 @@ domain: ffnw -country: DE remarks: ** nordwest admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffpb b/data/dns/ffpb index c7c1678c1..63e29119c 100644 --- a/data/dns/ffpb +++ b/data/dns/ffpb @@ -1,5 +1,4 @@ domain: ffpb -country: DE remarks: ** paderborn admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffpi b/data/dns/ffpi index 97c9686e2..a0e89921b 100644 --- a/data/dns/ffpi +++ b/data/dns/ffpi @@ -1,5 +1,4 @@ domain: ffpi -country: DE remarks: ** pinneberg admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffpr b/data/dns/ffpr index f6148f327..d139e57f5 100644 --- a/data/dns/ffpr +++ b/data/dns/ffpr @@ -1,5 +1,4 @@ domain: ffpr -country: DE remarks: ** prignitz admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffrade b/data/dns/ffrade index 5203f5da1..aa569adcb 100644 --- a/data/dns/ffrade +++ b/data/dns/ffrade @@ -1,5 +1,4 @@ domain: ffrade -country: DE remarks: ** radevormwald admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffrg b/data/dns/ffrg index dc5af3fb9..fb74b398c 100644 --- a/data/dns/ffrg +++ b/data/dns/ffrg @@ -1,5 +1,4 @@ domain: ffrg -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffrgb b/data/dns/ffrgb index fdb9fcbee..85b554314 100644 --- a/data/dns/ffrgb +++ b/data/dns/ffrgb @@ -1,5 +1,4 @@ domain: ffrgb -country: DE remarks: ** regensburg admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffrgw b/data/dns/ffrgw index 8b08e5fce..f414862b6 100644 --- a/data/dns/ffrgw +++ b/data/dns/ffrgw @@ -1,5 +1,4 @@ domain: ffrgw -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffsaar b/data/dns/ffsaar index 19d1ed0bf..fdf08bfd9 100644 --- a/data/dns/ffsaar +++ b/data/dns/ffsaar @@ -1,5 +1,4 @@ domain: ffsaar -country: DE remarks: ** saar admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffsg b/data/dns/ffsg index c4950f859..4f39cf7d3 100644 --- a/data/dns/ffsg +++ b/data/dns/ffsg @@ -1,5 +1,4 @@ domain: ffsg -country: DE remarks: ** solingen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffsl b/data/dns/ffsl index 19d41143d..952e7f650 100644 --- a/data/dns/ffsl +++ b/data/dns/ffsl @@ -1,5 +1,4 @@ domain: ffsl -country: DE remarks: ** saarlouis admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffstr b/data/dns/ffstr index 478847994..905945f24 100644 --- a/data/dns/ffstr +++ b/data/dns/ffstr @@ -1,5 +1,4 @@ domain: ffstr -country: DE remarks: ** ruhrgebiet admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffsu b/data/dns/ffsu index ae94b53b0..aa850548e 100644 --- a/data/dns/ffsu +++ b/data/dns/ffsu @@ -1,5 +1,4 @@ domain: ffsu -country: DE remarks: ** siegburg admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fftdf b/data/dns/fftdf index 0282d6000..fcdc4817d 100644 --- a/data/dns/fftdf +++ b/data/dns/fftdf @@ -1,5 +1,4 @@ domain: fftdf -country: DE remarks: ** troisdorf admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fftr b/data/dns/fftr index f14555da8..45deb3035 100644 --- a/data/dns/fftr +++ b/data/dns/fftr @@ -1,5 +1,4 @@ domain: fftr -country: DE remarks: ** trier admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fftup b/data/dns/fftup index 616cdac38..a8f3250ef 100644 --- a/data/dns/fftup +++ b/data/dns/fftup @@ -1,5 +1,4 @@ domain: fftup -country: DE remarks: ** waldheim admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fftut b/data/dns/fftut index b54f8c271..6f588422c 100644 --- a/data/dns/fftut +++ b/data/dns/fftut @@ -1,5 +1,4 @@ domain: fftut -country: DE remarks: ** tuttlingen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffue b/data/dns/ffue index 3b46a03db..131d2074a 100644 --- a/data/dns/ffue +++ b/data/dns/ffue @@ -1,5 +1,4 @@ domain: ffue -country: DE remarks: ** uelzen admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffulm b/data/dns/ffulm index 874609428..625ef1f0a 100644 --- a/data/dns/ffulm +++ b/data/dns/ffulm @@ -1,5 +1,4 @@ domain: ffulm -country: DE remarks: ** ulm admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffvp b/data/dns/ffvp index db93ac2b0..5db8266a7 100644 --- a/data/dns/ffvp +++ b/data/dns/ffvp @@ -1,5 +1,4 @@ domain: ffvp -country: DE remarks: ** suedwest admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffw b/data/dns/ffw index 0708d36e3..74fb0b686 100644 --- a/data/dns/ffw +++ b/data/dns/ffw @@ -1,5 +1,4 @@ domain: ffw -country: DE remarks: ** wuppertal admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffwdh b/data/dns/ffwdh index 12870c311..191de0852 100644 --- a/data/dns/ffwdh +++ b/data/dns/ffwdh @@ -1,5 +1,4 @@ domain: ffwdh -country: DE remarks: ** waldheim admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffweyher b/data/dns/ffweyher index 6465dde48..839516864 100644 --- a/data/dns/ffweyher +++ b/data/dns/ffweyher @@ -1,5 +1,4 @@ domain: ffweyher -country: DE remarks: ** suedwest admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffwk b/data/dns/ffwk index b9b77d626..695e76c7b 100644 --- a/data/dns/ffwk +++ b/data/dns/ffwk @@ -1,5 +1,4 @@ domain: ffwk -country: DE remarks: ** westkueste admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffwp b/data/dns/ffwp index aa3d428e6..5fcb1f3d1 100644 --- a/data/dns/ffwp +++ b/data/dns/ffwp @@ -1,5 +1,4 @@ domain: ffwp -country: DE remarks: ** westpfalz admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/ffws b/data/dns/ffws index ef5f2e31b..eddc4c2df 100644 --- a/data/dns/ffws +++ b/data/dns/ffws @@ -1,5 +1,4 @@ domain: ffws -country: DE remarks: ** suedwest admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/flat.dn42 b/data/dns/flat.dn42 index a8e8fac44..4167ecce8 100644 --- a/data/dns/flat.dn42 +++ b/data/dns/flat.dn42 @@ -1,5 +1,4 @@ domain: flat.dn42 -country: GB admin-c: IRL-DN42 tech-c: IRL-DN42 mnt-by: IRL-MNT diff --git a/data/dns/flb.dn42 b/data/dns/flb.dn42 index c62515b82..29fbb161c 100644 --- a/data/dns/flb.dn42 +++ b/data/dns/flb.dn42 @@ -1,5 +1,4 @@ domain: flb.dn42 -country: DE admin-c: SYSOFABLAB-DN42 tech-c: SYSOFABLAB-DN42 mnt-by: FABLABBERLIN-MNT diff --git a/data/dns/fleaz.dn42 b/data/dns/fleaz.dn42 index f6c594138..498693617 100644 --- a/data/dns/fleaz.dn42 +++ b/data/dns/fleaz.dn42 @@ -1,6 +1,5 @@ domain: fleaz.dn42 descr: Fleaz DN42 -country: DE admin-c: FLEAZ-DN42 tech-c: FLEAZ-DN42 mnt-by: FLEAZ-MNT diff --git a/data/dns/fleeb.dn42 b/data/dns/fleeb.dn42 index f56112813..9e1af9ac2 100644 --- a/data/dns/fleeb.dn42 +++ b/data/dns/fleeb.dn42 @@ -1,6 +1,5 @@ domain: fleeb.dn42 descr: fleeb network -country: DE admin-c: SZF-DN42 tech-c: SZF-DN42 mnt-by: SZF-MNT diff --git a/data/dns/fmie b/data/dns/fmie index 6a5bf5c46..3802b2e38 100644 --- a/data/dns/fmie +++ b/data/dns/fmie @@ -1,5 +1,4 @@ domain: fmie -country: DE remarks: ** ireland admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/freifunk b/data/dns/freifunk index 27cbc9cdb..cca928155 100644 --- a/data/dns/freifunk +++ b/data/dns/freifunk @@ -1,5 +1,4 @@ domain: freifunk -country: DE remarks: ** celle admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/fritz.dn42 b/data/dns/fritz.dn42 index ded430cb5..f22dd8b82 100644 --- a/data/dns/fritz.dn42 +++ b/data/dns/fritz.dn42 @@ -1,7 +1,6 @@ domain: fritz.dn42 remarks: Workaround to unbreak reverse DNS for my subnet, remarks: which has its nameservers hardcoded to ns[34].fritz.dn42 -country: DE admin-c: LUTOMA-DN42 tech-c: LUTOMA-DN42 mnt-by: LUTOMA-MNT diff --git a/data/dns/fsnx.dn42 b/data/dns/fsnx.dn42 index 8135f1254..f80fa6e3f 100644 --- a/data/dns/fsnx.dn42 +++ b/data/dns/fsnx.dn42 @@ -1,6 +1,5 @@ domain: fsnx.dn42 descr: FSNX Network -country: US admin-c: FSNX-DN42 tech-c: FSNX-DN42 mnt-by: FSNX-MNT diff --git a/data/dns/gedix.dn42 b/data/dns/gedix.dn42 index 84e936ab8..efabf763a 100644 --- a/data/dns/gedix.dn42 +++ b/data/dns/gedix.dn42 @@ -1,6 +1,5 @@ domain: gedix.dn42 descr: gedix dn domain -country: DE admin-c: NLDDEV1-DN42 tech-c: NLDDEV1-DN42 mnt-by: DDEV-MNT diff --git a/data/dns/gergernet.dn42 b/data/dns/gergernet.dn42 index 9f048c599..ea5712556 100644 --- a/data/dns/gergernet.dn42 +++ b/data/dns/gergernet.dn42 @@ -1,5 +1,4 @@ domain: gergernet.dn42 -country: DE admin-c: GERGER-DN42 tech-c: GERGER-DN42 mnt-by: GERGERNET-MNT diff --git a/data/dns/giga.dn42 b/data/dns/giga.dn42 index 087906a90..920583af5 100644 --- a/data/dns/giga.dn42 +++ b/data/dns/giga.dn42 @@ -1,5 +1,4 @@ domain: giga.dn42 -country: DE admin-c: GIGA-DN42 tech-c: GIGA-DN42 mnt-by: GIGA-MNT diff --git a/data/dns/gnilebein.dn42 b/data/dns/gnilebein.dn42 index 546b66359..186283b6e 100644 --- a/data/dns/gnilebein.dn42 +++ b/data/dns/gnilebein.dn42 @@ -1,6 +1,5 @@ domain: gnilebein.dn42 descr: MyDomain -country: DE admin-c: GNILEBEIN-DN42 tech-c: GNILEBEIN-DN42 mnt-by: GNILEBEIN-MNT diff --git a/data/dns/googol.dn42 b/data/dns/googol.dn42 index 8b622d4b0..2d0ddee55 100644 --- a/data/dns/googol.dn42 +++ b/data/dns/googol.dn42 @@ -1,6 +1,5 @@ domain: googol.dn42 descr: DN42 Search engine -country: HK admin-c: KAI-DN42 tech-c: KAI-DN42 mnt-by: KAI-MNT diff --git a/data/dns/gotroot.dn42 b/data/dns/gotroot.dn42 index 5ea2e9bef..4b52104a1 100644 --- a/data/dns/gotroot.dn42 +++ b/data/dns/gotroot.dn42 @@ -1,5 +1,4 @@ domain: gotroot.dn42 -country: CA admin-c: KTIMS-DN42 tech-c: KTIMS-DN42 mnt-by: GOTROOT-MNT diff --git a/data/dns/grmml.dn42 b/data/dns/grmml.dn42 index c23eeb4f2..0e778d651 100644 --- a/data/dns/grmml.dn42 +++ b/data/dns/grmml.dn42 @@ -1,6 +1,5 @@ domain: grmml.dn42 descr: GRMML Network Domain -country: DE admin-c: GRMML-DN42 tech-c: GRMML-DN42 mnt-by: GRMML-MNT diff --git a/data/dns/gruetzkopf.dn42 b/data/dns/gruetzkopf.dn42 index 695bd32b7..31316479e 100644 --- a/data/dns/gruetzkopf.dn42 +++ b/data/dns/gruetzkopf.dn42 @@ -1,5 +1,4 @@ domain: gruetzkopf.dn42 -country: DE admin-c: GRUETZKOPF-DN42 tech-c: GRUETZKOPF-DN42 mnt-by: GRUETZKOPF-MNT diff --git a/data/dns/gxa.dn42 b/data/dns/gxa.dn42 index 14fa20caa..32b761ccc 100644 --- a/data/dns/gxa.dn42 +++ b/data/dns/gxa.dn42 @@ -1,6 +1,5 @@ domain: gxa.dn42 descr: GXA -country: US admin-c: GXA-DN42 tech-c: GXA-DN42 mnt-by: GXA-MNT diff --git a/data/dns/gxanet.dn42 b/data/dns/gxanet.dn42 index fc6a6d7d0..69db39a04 100644 --- a/data/dns/gxanet.dn42 +++ b/data/dns/gxanet.dn42 @@ -1,6 +1,5 @@ domain: gxanet.dn42 descr: GXA -country: US admin-c: GXA-DN42 tech-c: GXA-DN42 mnt-by: GXA-MNT diff --git a/data/dns/h4.hack b/data/dns/h4.hack index 67f196a76..02253d333 100644 --- a/data/dns/h4.hack +++ b/data/dns/h4.hack @@ -1,5 +1,4 @@ domain: h4.hack -country: TR admin-c: H4-DN42 tech-c: H4-DN42 mnt-by: H4-MNT diff --git a/data/dns/hack b/data/dns/hack index 404b17514..9bb1d57ed 100644 --- a/data/dns/hack +++ b/data/dns/hack @@ -1,5 +1,4 @@ domain: hack -country: DE remarks: ** chaosvpn admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/halit.hack b/data/dns/halit.hack index 4c9326ecf..c16543ae4 100644 --- a/data/dns/halit.hack +++ b/data/dns/halit.hack @@ -1,5 +1,4 @@ domain: halit.hack -country: TR admin-c: H4-DN42 tech-c: H4-DN42 mnt-by: H4-MNT diff --git a/data/dns/hax404.dn42 b/data/dns/hax404.dn42 index efe39fd0d..917c47b44 100644 --- a/data/dns/hax404.dn42 +++ b/data/dns/hax404.dn42 @@ -1,5 +1,4 @@ domain: hax404.dn42 -country: DE admin-c: HAX404-DN42 tech-c: HAX404-DN42 mnt-by: HAX404-MNT diff --git a/data/dns/helgo b/data/dns/helgo index 3fea5c650..1e4f5a5e7 100644 --- a/data/dns/helgo +++ b/data/dns/helgo @@ -1,5 +1,4 @@ domain: helgo -country: DE remarks: ** helgoland admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/herzog.dn42 b/data/dns/herzog.dn42 index aa8bc2a2b..5296b8e80 100644 --- a/data/dns/herzog.dn42 +++ b/data/dns/herzog.dn42 @@ -1,5 +1,4 @@ domain: herzog.dn42 -country: DE admin-c: HERZOG-DN42 tech-c: HERZOG-DN42 mnt-by: KAESEKUCHENPW-MNT diff --git a/data/dns/icvpn b/data/dns/icvpn index 26335362c..c782058a4 100644 --- a/data/dns/icvpn +++ b/data/dns/icvpn @@ -1,5 +1,4 @@ domain: icvpn -country: DE remarks: ** meta admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/io.dn42 b/data/dns/io.dn42 index a1ada2a42..0fd6891a3 100644 --- a/data/dns/io.dn42 +++ b/data/dns/io.dn42 @@ -1,6 +1,5 @@ domain: io.dn42 descr: Skynet domain -country: DE admin-c: IO-DN42 tech-c: IO-DN42 mnt-by: SKYNET-MNT diff --git a/data/dns/ip.dn42 b/data/dns/ip.dn42 index b7bd34c5f..b256a1291 100644 --- a/data/dns/ip.dn42 +++ b/data/dns/ip.dn42 @@ -1,6 +1,5 @@ domain: ip.dn42 descr: ASoT What is my IP Service -country: CA admin-c: HEAVYMETAL-DN42 tech-c: HEAVYMETAL-DN42 mnt-by: ASOTNET-MNT diff --git a/data/dns/iutbeziers.dn42 b/data/dns/iutbeziers.dn42 index cf9e12b94..9b4514d5f 100644 --- a/data/dns/iutbeziers.dn42 +++ b/data/dns/iutbeziers.dn42 @@ -1,6 +1,5 @@ domain: iutbeziers.dn42 descr: IUT Béziers DN42 nameserver -country: FR admin-c: QUENTIN-DN42 tech-c: QUENTIN-DN42 mnt-by: IUT-BEZIERS-MNT diff --git a/data/dns/ix.dn42 b/data/dns/ix.dn42 index 7511f900f..26da8dd56 100644 --- a/data/dns/ix.dn42 +++ b/data/dns/ix.dn42 @@ -1,6 +1,5 @@ domain: ix.dn42 descr: General IX domain -country: US admin-c: TOMBII-DN42 admin-c: NL-ZUID-DN42 tech-c: TOMBII-DN42 diff --git a/data/dns/ixnet.dn42 b/data/dns/ixnet.dn42 index f95082531..1bfb3f847 100644 --- a/data/dns/ixnet.dn42 +++ b/data/dns/ixnet.dn42 @@ -1,6 +1,5 @@ domain: ixnet.dn42 descr: IX Network Main Domain -country: SG admin-c: HOWARD-DN42 tech-c: HOWARD-DN42 mnt-by: IXNET-MNT diff --git a/data/dns/j.dn42 b/data/dns/j.dn42 index 302d7dab1..7bc1a836f 100644 --- a/data/dns/j.dn42 +++ b/data/dns/j.dn42 @@ -1,6 +1,5 @@ domain: j.dn42 descr: jomat -country: DE admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/jabber.dn42 b/data/dns/jabber.dn42 index 99c812741..8bccaa2ea 100644 --- a/data/dns/jabber.dn42 +++ b/data/dns/jabber.dn42 @@ -1,6 +1,5 @@ domain: jabber.dn42 descr: Jabber / XMPP Service -country: DE admin-c: GRMML-DN42 tech-c: GRMML-DN42 mnt-by: GRMML-MNT diff --git a/data/dns/jan.dn42 b/data/dns/jan.dn42 index 380770a67..cafc5ff69 100644 --- a/data/dns/jan.dn42 +++ b/data/dns/jan.dn42 @@ -1,5 +1,4 @@ domain: jan.dn42 -country: DE admin-c: JAN-DN42 tech-c: JAN-DN42 mnt-by: JAN-MNT diff --git a/data/dns/jgn.dn42 b/data/dns/jgn.dn42 index 1efbbd4c1..cac0799d0 100644 --- a/data/dns/jgn.dn42 +++ b/data/dns/jgn.dn42 @@ -1,6 +1,5 @@ domain: jgn.dn42 descr: JGNDATA-DOMAIN -country: US admin-c: JUSTIN-DN42 tech-c: JUSTIN-DN42 mnt-by: JGNDATA-MNT diff --git a/data/dns/jmt.dn42 b/data/dns/jmt.dn42 index a2c610d19..d1140445a 100644 --- a/data/dns/jmt.dn42 +++ b/data/dns/jmt.dn42 @@ -1,6 +1,5 @@ domain: jmt.dn42 descr: jmt.dn42 -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/jomat.dn42 b/data/dns/jomat.dn42 index d86c0d5ae..96bbd1a13 100644 --- a/data/dns/jomat.dn42 +++ b/data/dns/jomat.dn42 @@ -1,6 +1,5 @@ domain: jomat.dn42 descr: jomat.dn42 -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/julez.dn42 b/data/dns/julez.dn42 index b478d6f47..340ecc039 100644 --- a/data/dns/julez.dn42 +++ b/data/dns/julez.dn42 @@ -1,5 +1,4 @@ domain: julez.dn42 -country: DE admin-c: JULEZ-DN42 tech-c: JULEZ-DN42 mnt-by: JULEZ-MNT diff --git a/data/dns/kai-server.dn42 b/data/dns/kai-server.dn42 index 06d57634f..57367e072 100644 --- a/data/dns/kai-server.dn42 +++ b/data/dns/kai-server.dn42 @@ -1,6 +1,5 @@ domain: kai-server.dn42 descr: Domain, what else? -country: HK admin-c: KAI-DN42 tech-c: KAI-DN42 mnt-by: KAI-MNT diff --git a/data/dns/kai.cool b/data/dns/kai.cool index bdaaa6ea3..24e0c8e34 100644 --- a/data/dns/kai.cool +++ b/data/dns/kai.cool @@ -1,6 +1,5 @@ domain: kai.cool descr: 1:1 copy of my own domain in DN42 -country: HK admin-c: KAI-DN42 tech-c: KAI-DN42 mnt-by: KAI-MNT diff --git a/data/dns/kai.dn42 b/data/dns/kai.dn42 index 8c5be81ba..9fb7525ee 100644 --- a/data/dns/kai.dn42 +++ b/data/dns/kai.dn42 @@ -1,6 +1,5 @@ domain: kai.dn42 descr: xiaoyu-net -country: US admin-c: XIAOYU-DN42 tech-c: XIAOYU-DN42 mnt-by: XIAOYU-MNT diff --git a/data/dns/kaiflix.dn42 b/data/dns/kaiflix.dn42 index 7afd1c668..28cbfdef8 100644 --- a/data/dns/kaiflix.dn42 +++ b/data/dns/kaiflix.dn42 @@ -1,6 +1,5 @@ domain: kaiflix.dn42 descr: Domain for Webservice Kaiflix -country: HK admin-c: KAI-DN42 tech-c: KAI-DN42 mnt-by: KAI-MNT diff --git a/data/dns/kingof.dn42 b/data/dns/kingof.dn42 index c8946d743..f00812290 100644 --- a/data/dns/kingof.dn42 +++ b/data/dns/kingof.dn42 @@ -1,6 +1,5 @@ domain: kingof.dn42 descr: King of dn42 -country: NL admin-c: DOVY-DN42 tech-c: DOVY-DN42 mnt-by: DOVY-MNT diff --git a/data/dns/krstn.dn42 b/data/dns/krstn.dn42 index 5cebe6356..72bb29cb3 100644 --- a/data/dns/krstn.dn42 +++ b/data/dns/krstn.dn42 @@ -1,5 +1,4 @@ domain: krstn.dn42 -country: DE admin-c: KRSTN-DN42 tech-c: KRSTN-DN42 mnt-by: KRSTN-MNT diff --git a/data/dns/leroy.dn42 b/data/dns/leroy.dn42 index c66c98dc5..1702eff4d 100644 --- a/data/dns/leroy.dn42 +++ b/data/dns/leroy.dn42 @@ -1,6 +1,5 @@ domain: leroy.dn42 descr: Leroy's DN42 Domain -country: SG admin-c: LEROY-DN42 tech-c: LEROY-DN42 mnt-by: LEROY-MNT diff --git a/data/dns/lf-net.dn42 b/data/dns/lf-net.dn42 index 33fa84e0a..725578d58 100644 --- a/data/dns/lf-net.dn42 +++ b/data/dns/lf-net.dn42 @@ -1,5 +1,4 @@ domain: lf-net.dn42 -country: DE admin-c: LITTLEFOX-DN42 tech-c: LITTLEFOX-DN42 mnt-by: LFNET-MNT diff --git a/data/dns/lg.dn42 b/data/dns/lg.dn42 index 6a96ab02e..e5e8ab71f 100644 --- a/data/dns/lg.dn42 +++ b/data/dns/lg.dn42 @@ -1,6 +1,5 @@ domain: lg.dn42 descr: Looking glass -country: SE admin-c: TOMBII-DN42 tech-c: TOMBII-DN42 mnt-by: TOMBII-DN42-MNT diff --git a/data/dns/lhs.dn42 b/data/dns/lhs.dn42 index 4d3ac7c76..640619454 100644 --- a/data/dns/lhs.dn42 +++ b/data/dns/lhs.dn42 @@ -1,6 +1,5 @@ domain: lhs.dn42 descr: Limassol Hackerspace -country: CY admin-c: KEVIT-DN42 tech-c: KEVIT-DN42 mnt-by: FALANSTER-MNT diff --git a/data/dns/loaderror.dn42 b/data/dns/loaderror.dn42 index 77c4f605a..a8fcd6385 100644 --- a/data/dns/loaderror.dn42 +++ b/data/dns/loaderror.dn42 @@ -1,6 +1,5 @@ domain: loaderror.dn42 descr: Loaderror -country: DE admin-c: TSYS-DN42 tech-c: TSYS-DN42 mnt-by: TSYS-MNT diff --git a/data/dns/localnet.dn42 b/data/dns/localnet.dn42 index 8f76f352b..4a44cb5b7 100644 --- a/data/dns/localnet.dn42 +++ b/data/dns/localnet.dn42 @@ -1,6 +1,5 @@ domain: localnet.dn42 descr: Localnet domain -country: ES admin-c: OPOTONIL-DN42 tech-c: OPOTONIL-DN42 mnt-by: LOCALNET-MNT diff --git a/data/dns/luclu7.dn42 b/data/dns/luclu7.dn42 index cdba0c2c4..83b4a9049 100644 --- a/data/dns/luclu7.dn42 +++ b/data/dns/luclu7.dn42 @@ -1,6 +1,5 @@ domain: luclu7.dn42 descr: Luclu7's DN42's domain -country: FR admin-c: LUCLU7-DN42 tech-c: LUCLU7-DN42 mnt-by: LUCLU7-MNT diff --git a/data/dns/lutoma.dn42 b/data/dns/lutoma.dn42 index 19e743f00..32db9e79a 100644 --- a/data/dns/lutoma.dn42 +++ b/data/dns/lutoma.dn42 @@ -1,5 +1,4 @@ domain: lutoma.dn42 -country: DE admin-c: LUTOMA-DN42 tech-c: LUTOMA-DN42 mnt-by: LUTOMA-MNT diff --git a/data/dns/lxnet.dn42 b/data/dns/lxnet.dn42 index 3697eb0b2..b5383e7db 100644 --- a/data/dns/lxnet.dn42 +++ b/data/dns/lxnet.dn42 @@ -1,5 +1,4 @@ domain: lxnet.dn42 -country: DE admin-c: LYREX-DN42 tech-c: LYREX-DN42 mnt-by: LYREX-MNT diff --git a/data/dns/lynx.dn42 b/data/dns/lynx.dn42 index a99721b5c..846798c5e 100644 --- a/data/dns/lynx.dn42 +++ b/data/dns/lynx.dn42 @@ -1,6 +1,5 @@ domain: lynx.dn42 descr: lex's domain -country: GB admin-c: LEX-DN42 tech-c: LEX-DN42 mnt-by: LEX-MNT diff --git a/data/dns/m33.dn42 b/data/dns/m33.dn42 index c88df599d..64f670aff 100644 --- a/data/dns/m33.dn42 +++ b/data/dns/m33.dn42 @@ -1,6 +1,5 @@ domain: m33.dn42 descr: M33 -country: DE admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/macsbone.dn42 b/data/dns/macsbone.dn42 index e61ab601c..561c4c5bf 100644 --- a/data/dns/macsbone.dn42 +++ b/data/dns/macsbone.dn42 @@ -1,5 +1,4 @@ domain: macsbone.dn42 -country: DE admin-c: BERNHARD-DN42 tech-c: BERNHARD-DN42 mnt-by: MCBONE-MNT diff --git a/data/dns/maglab.dn42 b/data/dns/maglab.dn42 index d640c2c71..9d7b7014d 100644 --- a/data/dns/maglab.dn42 +++ b/data/dns/maglab.dn42 @@ -1,6 +1,5 @@ domain: maglab.dn42 descr: Magrathea Laboratorires e.V. -country: DE admin-c: MAJOR-DN42 tech-c: MAJOR-DN42 mnt-by: MAJOR-MNT diff --git a/data/dns/mail.dn42 b/data/dns/mail.dn42 index 1d8c89e63..2af4fbca3 100644 --- a/data/dns/mail.dn42 +++ b/data/dns/mail.dn42 @@ -1,5 +1,4 @@ domain: mail.dn42 -country: SI admin-c: NIXNODES-DN42 tech-c: NIXNODES-DN42 mnt-by: NIXNODES-MNT diff --git a/data/dns/major.dn42 b/data/dns/major.dn42 index 9598747bd..a779b061c 100644 --- a/data/dns/major.dn42 +++ b/data/dns/major.dn42 @@ -1,5 +1,4 @@ domain: major.dn42 -country: DE admin-c: MAJOR-DN42 tech-c: MAJOR-DN42 mnt-by: MAJOR-MNT diff --git a/data/dns/maltejk.dn42 b/data/dns/maltejk.dn42 index e1e3800b9..00d326b51 100644 --- a/data/dns/maltejk.dn42 +++ b/data/dns/maltejk.dn42 @@ -1,5 +1,4 @@ domain: maltejk.dn42 -country: DE admin-c: MALTEJK-DN42 tech-c: MALTEJK-DN42 mnt-by: MALTEJK-MNT diff --git a/data/dns/marlinc.dn42 b/data/dns/marlinc.dn42 index 41f189d43..0abd042c2 100644 --- a/data/dns/marlinc.dn42 +++ b/data/dns/marlinc.dn42 @@ -1,5 +1,4 @@ domain: marlinc.dn42 -country: NL admin-c: MARLINC-DN42 tech-c: MARLINC-DN42 mnt-by: MARLINC-MNT diff --git a/data/dns/media.dn42 b/data/dns/media.dn42 index 75f67b4cf..d4c4eebee 100644 --- a/data/dns/media.dn42 +++ b/data/dns/media.dn42 @@ -1,6 +1,5 @@ domain: media.dn42 descr: Media -country: DE admin-c: TOBEE-DN42 tech-c: TOBEE-DN42 mnt-by: BLAZING-MNT diff --git a/data/dns/mhm.dn42 b/data/dns/mhm.dn42 index a1b822290..864e35016 100644 --- a/data/dns/mhm.dn42 +++ b/data/dns/mhm.dn42 @@ -1,5 +1,4 @@ domain: mhm.dn42 -country: DE admin-c: TOBEE-DN42 tech-c: TOBEE-DN42 mnt-by: BLAZING-MNT diff --git a/data/dns/miau.dn42 b/data/dns/miau.dn42 index 92319d455..05bae6b66 100644 --- a/data/dns/miau.dn42 +++ b/data/dns/miau.dn42 @@ -1,5 +1,4 @@ domain: miau.dn42 -country: DE admin-c: MIAU-DN42 tech-c: MIAU-DN42 mnt-by: MIAU-MNT diff --git a/data/dns/minkenetz.dn42 b/data/dns/minkenetz.dn42 index c9e1952f2..076fe1dcf 100644 --- a/data/dns/minkenetz.dn42 +++ b/data/dns/minkenetz.dn42 @@ -1,6 +1,5 @@ domain: minkenetz.dn42 descr: MinkeNetz Domain -country: DE admin-c: MINKE-DN42 tech-c: MINKE-DN42 mnt-by: MINKE-MNT diff --git a/data/dns/mirrors.dn42 b/data/dns/mirrors.dn42 index be93a098b..44373f791 100644 --- a/data/dns/mirrors.dn42 +++ b/data/dns/mirrors.dn42 @@ -1,6 +1,5 @@ domain: mirrors.dn42 descr: Mirrors DNS -country: NL admin-c: TRUNET-DN42 tech-c: TRUNET-DN42 mnt-by: TRUNET-MNT diff --git a/data/dns/moho.dn42 b/data/dns/moho.dn42 index d8f1bbfb4..c2f982b4b 100644 --- a/data/dns/moho.dn42 +++ b/data/dns/moho.dn42 @@ -1,6 +1,5 @@ domain: moho.dn42 descr: dns for moho -country: DE admin-c: MOHO-DN42 tech-c: MOHO-DN42 mnt-by: MOHO-MNT diff --git a/data/dns/mortzu.dn42 b/data/dns/mortzu.dn42 index e2c551002..4255ad606 100644 --- a/data/dns/mortzu.dn42 +++ b/data/dns/mortzu.dn42 @@ -1,5 +1,4 @@ domain: mortzu.dn42 -country: DE nserver: ns-1.mortzu.dn42 172.22.192.19 nserver: ns-2.mortzu.dn42 172.22.192.226 admin-c: MORTZU-DN42 diff --git a/data/dns/mt.dn42 b/data/dns/mt.dn42 index e79377c13..d1b65b7c1 100644 --- a/data/dns/mt.dn42 +++ b/data/dns/mt.dn42 @@ -1,5 +1,4 @@ domain: mt.dn42 -country: GB admin-c: MT-DN42 tech-c: MT-DN42 mnt-by: MT-MNT diff --git a/data/dns/mueritz b/data/dns/mueritz index 58dd9f04f..04957b27b 100644 --- a/data/dns/mueritz +++ b/data/dns/mueritz @@ -1,5 +1,4 @@ domain: mueritz -country: DE remarks: ** mueritz admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/n.dn42 b/data/dns/n.dn42 index 4859fc07d..e1c334670 100644 --- a/data/dns/n.dn42 +++ b/data/dns/n.dn42 @@ -1,6 +1,5 @@ domain: n.dn42 descr: domain for neo network -country: US admin-c: NEO-DN42 tech-c: NEO-DN42 mnt-by: NEO-MNT diff --git a/data/dns/nasheed.dn42 b/data/dns/nasheed.dn42 index 0502f0484..7fa1ed15e 100644 --- a/data/dns/nasheed.dn42 +++ b/data/dns/nasheed.dn42 @@ -1,5 +1,4 @@ domain: nasheed.dn42 -country: DE admin-c: TSYS-DN42 tech-c: TSYS-DN42 mnt-by: TSYS-MNT diff --git a/data/dns/nek0.dn42 b/data/dns/nek0.dn42 index 3a07d4c84..be745ba7c 100644 --- a/data/dns/nek0.dn42 +++ b/data/dns/nek0.dn42 @@ -1,6 +1,5 @@ domain: nek0.dn42 descr: nek0s blog -country: DE org: ORG-CHELNOK admin-c: ERI-DN42 tech-c: ERI-DN42 diff --git a/data/dns/neo.dn42 b/data/dns/neo.dn42 index f4be50d28..ce691125f 100644 --- a/data/dns/neo.dn42 +++ b/data/dns/neo.dn42 @@ -1,6 +1,5 @@ domain: neo.dn42 descr: neo.dn42 - powered by Biscuit -country: US admin-c: BISCUIT-DN42 tech-c: BISCUIT-DN42 mnt-by: BISCUIT-MNT diff --git a/data/dns/nerdinger.dn42 b/data/dns/nerdinger.dn42 index b44e0dc26..6ddd819b1 100644 --- a/data/dns/nerdinger.dn42 +++ b/data/dns/nerdinger.dn42 @@ -1,5 +1,4 @@ domain: nerdinger.dn42 -country: DE admin-c: KRSTN-DN42 tech-c: KRSTN-DN42 mnt-by: KRSTN-MNT diff --git a/data/dns/net.dn42 b/data/dns/net.dn42 index 6cfed9b3a..627519ae2 100644 --- a/data/dns/net.dn42 +++ b/data/dns/net.dn42 @@ -1,5 +1,4 @@ domain: net.dn42 -country: DE admin-c: JULEZ-DN42 tech-c: JULEZ-DN42 mnt-by: JULEZ-MNT diff --git a/data/dns/netblocks.dn42 b/data/dns/netblocks.dn42 index 8e8a71b0d..7b8c91052 100644 --- a/data/dns/netblocks.dn42 +++ b/data/dns/netblocks.dn42 @@ -1,5 +1,4 @@ domain: netblocks.dn42 -country: DE admin-c: KRSTN-DN42 tech-c: KRSTN-DN42 mnt-by: KRSTN-MNT diff --git a/data/dns/netclipse.dn42 b/data/dns/netclipse.dn42 index 53597f8cd..ef171df15 100644 --- a/data/dns/netclipse.dn42 +++ b/data/dns/netclipse.dn42 @@ -1,6 +1,5 @@ domain: netclipse.dn42 descr: netclipse.dn42 -country: MY admin-c: NETCLIPSE-DN42 tech-c: NETCLIPSE-DN42 mnt-by: NETCLIPSE-MNT diff --git a/data/dns/ngit.dn42 b/data/dns/ngit.dn42 index e39cafe66..5e103031f 100644 --- a/data/dns/ngit.dn42 +++ b/data/dns/ngit.dn42 @@ -1,5 +1,4 @@ domain: ngit.dn42 -country: SI admin-c: NIXNODES-DN42 tech-c: NIXNODES-DN42 mnt-by: NIXNODES-MNT diff --git a/data/dns/nic.dn42 b/data/dns/nic.dn42 index 1b7015d23..05fe944b3 100644 --- a/data/dns/nic.dn42 +++ b/data/dns/nic.dn42 @@ -1,6 +1,5 @@ domain: nic.dn42 descr: Network Information Center - DN42 -country: SI admin-c: NIXNODES-DN42 tech-c: NIXNODES-DN42 mnt-by: NIXNODES-MNT diff --git a/data/dns/nixnodes.dn42 b/data/dns/nixnodes.dn42 index 52b1a03ad..c67389632 100644 --- a/data/dns/nixnodes.dn42 +++ b/data/dns/nixnodes.dn42 @@ -1,5 +1,4 @@ domain: nixnodes.dn42 -country: SI admin-c: NIXNODES-DN42 tech-c: NIXNODES-DN42 mnt-by: NIXNODES-MNT diff --git a/data/dns/nl-zuid.dn42 b/data/dns/nl-zuid.dn42 index 821d467d6..809c2a1eb 100644 --- a/data/dns/nl-zuid.dn42 +++ b/data/dns/nl-zuid.dn42 @@ -1,6 +1,5 @@ domain: nl-zuid.dn42 descr: NL Zuid website -country: NL admin-c: NL-ZUID-DN42 tech-c: NL-ZUID-DN42 mnt-by: MARLINC-MNT diff --git a/data/dns/nobody44.dn42 b/data/dns/nobody44.dn42 index 945e01597..35ca5567f 100644 --- a/data/dns/nobody44.dn42 +++ b/data/dns/nobody44.dn42 @@ -1,6 +1,5 @@ domain: nobody44.dn42 descr: Nobody44 Domain -country: DE admin-c: PAUL-DN42 tech-c: PAUL-DN42 mnt-by: NOB-MNT diff --git a/data/dns/nodauf.dn42 b/data/dns/nodauf.dn42 index 246202ae8..97c817ce4 100644 --- a/data/dns/nodauf.dn42 +++ b/data/dns/nodauf.dn42 @@ -1,6 +1,5 @@ domain: nodauf.dn42 nserver: ns.nodauf.dn42 172.22.185.2 -country: FR admin-c: NODAUF-DN42 tech-c: NODAUF-DN42 mnt-by: NODAUF-MNT diff --git a/data/dns/nop.dn42 b/data/dns/nop.dn42 index e7e93ad41..9c9b4ce8c 100644 --- a/data/dns/nop.dn42 +++ b/data/dns/nop.dn42 @@ -1,6 +1,5 @@ domain: nop.dn42 descr: nop -country: HU admin-c: MC36-DN42 tech-c: MC36-DN42 mnt-by: NOP-MNT diff --git a/data/dns/noteblok.dn42 b/data/dns/noteblok.dn42 index 5d13a74b2..c10af36ad 100644 --- a/data/dns/noteblok.dn42 +++ b/data/dns/noteblok.dn42 @@ -1,6 +1,5 @@ domain: noteblok.dn42 descr: my personal web blog -country: DE admin-c: STV0G-DN42 tech-c: STV0G-DN42 mnt-by: NULLL-MNT diff --git a/data/dns/ntp.dn42 b/data/dns/ntp.dn42 index fd2d18ef3..acd2d25da 100644 --- a/data/dns/ntp.dn42 +++ b/data/dns/ntp.dn42 @@ -1,6 +1,5 @@ domain: ntp.dn42 descr: A Series of Tubez Networks NTP Service -country: CA admin-c: HEAVYMETAL-DN42 tech-c: HEAVYMETAL-DN42 mnt-by: ASOTNET-MNT diff --git a/data/dns/nullroute.dn42 b/data/dns/nullroute.dn42 index 4d12815bc..993694ab0 100644 --- a/data/dns/nullroute.dn42 +++ b/data/dns/nullroute.dn42 @@ -1,5 +1,4 @@ domain: nullroute.dn42 -country: LT admin-c: GRAWITY-DN42 tech-c: GRAWITY-DN42 nserver: sky.nullroute.eu.org diff --git a/data/dns/ois.dn42 b/data/dns/ois.dn42 index 5a91d8e52..e7986efe7 100644 --- a/data/dns/ois.dn42 +++ b/data/dns/ois.dn42 @@ -1,5 +1,4 @@ domain: ois.dn42 -country: DE admin-c: SYSOFABLAB-DN42 tech-c: SYSOFABLAB-DN42 mnt-by: FABLABBERLIN-MNT diff --git a/data/dns/onion.dn42 b/data/dns/onion.dn42 index d49e638ff..bec210210 100644 --- a/data/dns/onion.dn42 +++ b/data/dns/onion.dn42 @@ -1,5 +1,4 @@ domain: onion.dn42 -country: GB admin-c: IRL-DN42 tech-c: IRL-DN42 mnt-by: IRL-MNT diff --git a/data/dns/overview.dn42 b/data/dns/overview.dn42 index 12395b5aa..c0b50fe05 100644 --- a/data/dns/overview.dn42 +++ b/data/dns/overview.dn42 @@ -1,6 +1,5 @@ domain: overview.dn42 descr: A overview of services including monitoring -country: AT admin-c: FLORIANB-DN42 tech-c: FLORIANB-DN42 mnt-by: FLORIANB-MNT diff --git a/data/dns/pad.dn42 b/data/dns/pad.dn42 index c7c89d931..7113e81f6 100644 --- a/data/dns/pad.dn42 +++ b/data/dns/pad.dn42 @@ -1,6 +1,5 @@ domain: pad.dn42 descr: etherpad -country: GB admin-c: ANA-DN42 tech-c: ANA-DN42 mnt-by: ANA-MNT diff --git a/data/dns/pads.dn42 b/data/dns/pads.dn42 index 2f75dbdd9..ee88cc9e2 100644 --- a/data/dns/pads.dn42 +++ b/data/dns/pads.dn42 @@ -1,5 +1,4 @@ domain: pads.dn42 -country: DE nserver: ns-1.mortzu.dn42 nserver: ns-2.mortzu.dn42 admin-c: MORTZU-DN42 diff --git a/data/dns/paste.dn42 b/data/dns/paste.dn42 index 10c76efab..bb80564b7 100644 --- a/data/dns/paste.dn42 +++ b/data/dns/paste.dn42 @@ -1,6 +1,5 @@ domain: paste.dn42 descr: pastebin -country: FR admin-c: TOMBII-DN42 tech-c: TOMBII-DN42 mnt-by: TOMBII-DN42-MNT diff --git a/data/dns/pgp.dn42 b/data/dns/pgp.dn42 index 0836d2327..c668aac3b 100644 --- a/data/dns/pgp.dn42 +++ b/data/dns/pgp.dn42 @@ -1,6 +1,5 @@ domain: pgp.dn42 descr: PGP keyserver -country: DE admin-c: LUTOMA-DN42 tech-c: LUTOMA-DN42 mnt-by: LUTOMA-MNT diff --git a/data/dns/picocloud.dn42 b/data/dns/picocloud.dn42 index 16f672505..07bafbf6a 100644 --- a/data/dns/picocloud.dn42 +++ b/data/dns/picocloud.dn42 @@ -1,6 +1,5 @@ domain: picocloud.dn42 descr: picoCloud -country: CA admin-c: MALAIWAH-DN42 tech-c: MALAIWAH-DN42 mnt-by: PICOCLOUD-MNT diff --git a/data/dns/piston.dn42 b/data/dns/piston.dn42 index 3e8c9d826..516557b35 100644 --- a/data/dns/piston.dn42 +++ b/data/dns/piston.dn42 @@ -1,6 +1,5 @@ domain: piston.dn42 descr: The best domain in the block -country: US admin-c: MIKE-DN42 tech-c: MIKE-DN42 mnt-by: PISTON-MNT diff --git a/data/dns/pktsurf.dn42 b/data/dns/pktsurf.dn42 index 3f4ac2329..379ca0b2e 100644 --- a/data/dns/pktsurf.dn42 +++ b/data/dns/pktsurf.dn42 @@ -1,5 +1,4 @@ domain: pktsurf.dn42 -country: IN admin-c: PKTSRF-DN42 tech-c: PKTSRF-DN42 mnt-by: PKTSRF-MNT diff --git a/data/dns/plasmatrix.dn42 b/data/dns/plasmatrix.dn42 index d82d221f0..42b299059 100644 --- a/data/dns/plasmatrix.dn42 +++ b/data/dns/plasmatrix.dn42 @@ -1,6 +1,5 @@ domain: plasmatrix.dn42 descr: Domain used on PLASMATRIX-AS -country: DE admin-c: PLASMA-DN42 tech-c: PLASMA-DN42 mnt-by: PLASMATRIX-MNT diff --git a/data/dns/plumbus.dn42 b/data/dns/plumbus.dn42 index 2f2cf8c34..61abb1135 100644 --- a/data/dns/plumbus.dn42 +++ b/data/dns/plumbus.dn42 @@ -1,6 +1,5 @@ domain: plumbus.dn42 descr: plumbus network -country: DE admin-c: SZF-DN42 tech-c: SZF-DN42 mnt-by: SZF-MNT diff --git a/data/dns/pmenke.dn42 b/data/dns/pmenke.dn42 index cb95475a3..47c47f303 100644 --- a/data/dns/pmenke.dn42 +++ b/data/dns/pmenke.dn42 @@ -1,5 +1,4 @@ domain: pmenke.dn42 -country: DE admin-c: PMENKE-DN42 tech-c: PMENKE-DN42 mnt-by: PMENKE-MNT diff --git a/data/dns/pppingme.dn42 b/data/dns/pppingme.dn42 index 99275238c..13f58b53a 100644 --- a/data/dns/pppingme.dn42 +++ b/data/dns/pppingme.dn42 @@ -1,6 +1,5 @@ domain: pppingme.dn42 descr: pppingme.dn42 -country: US admin-c: PPPINGME-DN42 tech-c: PPPINGME-DN42 mnt-by: PPPINGME-MNT diff --git a/data/dns/pr0gramm.dn42 b/data/dns/pr0gramm.dn42 index f3cc68913..7655f75d2 100644 --- a/data/dns/pr0gramm.dn42 +++ b/data/dns/pr0gramm.dn42 @@ -1,5 +1,4 @@ domain: pr0gramm.dn42 -country: DE admin-c: TOBEE-DN42 tech-c: TOBEE-DN42 mnt-by: BLAZING-MNT diff --git a/data/dns/probsd.dn42 b/data/dns/probsd.dn42 index 4b3866c44..acff7d077 100644 --- a/data/dns/probsd.dn42 +++ b/data/dns/probsd.dn42 @@ -1,6 +1,5 @@ domain: probsd.dn42 descr: ProBSD -country: PL admin-c: LEWY-DN42 tech-c: LEWY-DN42 mnt-by: LEWY-MNT diff --git a/data/dns/projectmori.dn42 b/data/dns/projectmori.dn42 index f0b1dda6e..2833ca73f 100644 --- a/data/dns/projectmori.dn42 +++ b/data/dns/projectmori.dn42 @@ -1,7 +1,6 @@ domain: projectmori.dn42 descr: Primary domain for PROJECTMORI status: EVALPEND 1504004424 -country: US admin-c: MORI-DN42 tech-c: MORI-DN42 mnt-by: PROJECTMORI-MNT diff --git a/data/dns/prooops.dn42 b/data/dns/prooops.dn42 index f4ae70930..09f32b7a6 100644 --- a/data/dns/prooops.dn42 +++ b/data/dns/prooops.dn42 @@ -1,6 +1,5 @@ domain: prooops.dn42 admin-c: BODEMS-DN42 -country: DE tech-c: BODEMS-DN42 mnt-by: BODEMS-MNT nserver: ns0.bodems.dn42 diff --git a/data/dns/proxity.dn42 b/data/dns/proxity.dn42 index a9577b8ae..0cf1e88de 100644 --- a/data/dns/proxity.dn42 +++ b/data/dns/proxity.dn42 @@ -1,6 +1,5 @@ domain: proxity.dn42 descr: proxity nerd crew -country: DE admin-c: RIPPERFOX-DN42 tech-c: RIPPERFOX-DN42 mnt-by: RIPPERFOX-MNT diff --git a/data/dns/purrdeta.dn42 b/data/dns/purrdeta.dn42 index a0b739d13..6dc0d08bc 100644 --- a/data/dns/purrdeta.dn42 +++ b/data/dns/purrdeta.dn42 @@ -1,6 +1,5 @@ domain: purrdeta.dn42 descr: Purrdeta -country: US admin-c: PURRDETA-DN42 tech-c: PURRDETA-DN42 mnt-by: PURRDETA-MNT diff --git a/data/dns/qsx.dn42 b/data/dns/qsx.dn42 index d54dd9932..be3c2f392 100644 --- a/data/dns/qsx.dn42 +++ b/data/dns/qsx.dn42 @@ -1,5 +1,4 @@ domain: qsx.dn42 -country: DE admin-c: QSX-DN42 tech-c: QSX-DN42 mnt-by: QSX-MNT diff --git a/data/dns/raider.dn42 b/data/dns/raider.dn42 index 0e64e6a43..221b2e1a6 100644 --- a/data/dns/raider.dn42 +++ b/data/dns/raider.dn42 @@ -1,6 +1,5 @@ domain: raider.dn42 descr: raider.dn42 -country: DE admin-c: RAIDER-DN42 tech-c: RAIDER-DN42 mnt-by: LURKAT-MNT diff --git a/data/dns/rbz.dn42 b/data/dns/rbz.dn42 index 0a27169e7..0f9a667f3 100644 --- a/data/dns/rbz.dn42 +++ b/data/dns/rbz.dn42 @@ -1,6 +1,5 @@ domain: rbz.dn42 descr: rbz.ee -country: EE admin-c: REISENB-DN42 tech-c: REISENB-DN42 mnt-by: REISENB-MNT diff --git a/data/dns/robbie.dn42 b/data/dns/robbie.dn42 index 03e4afdf4..0687a8ffe 100644 --- a/data/dns/robbie.dn42 +++ b/data/dns/robbie.dn42 @@ -1,6 +1,5 @@ domain: robbie.dn42 descr: Robbie Fan Club -country: GB admin-c: CALLUM-DN42 tech-c: CALLUM-DN42 mnt-by: CALLUM-MNT diff --git a/data/dns/robotham.dn42 b/data/dns/robotham.dn42 index f2f4ec57e..37c29278c 100644 --- a/data/dns/robotham.dn42 +++ b/data/dns/robotham.dn42 @@ -1,5 +1,4 @@ domain: robotham.dn42 -country: US admin-c: ROBOTHAM-DN42 tech-c: ROBOTHAM-DN42 mnt-by: ROBOTHAM-MNT diff --git a/data/dns/roelf.dn42 b/data/dns/roelf.dn42 index a97850f07..0170baa03 100644 --- a/data/dns/roelf.dn42 +++ b/data/dns/roelf.dn42 @@ -1,5 +1,4 @@ domain: roelf.dn42 -country: NL admin-c: REWBYCRAFT-DN42 tech-c: REWBYCRAFT-DN42 mnt-by: REWBYSOFT-MNT diff --git a/data/dns/root6.dn42 b/data/dns/root6.dn42 index dbc1ffa34..ba8ed068e 100644 --- a/data/dns/root6.dn42 +++ b/data/dns/root6.dn42 @@ -1,5 +1,4 @@ domain: root6.dn42 -country: DE admin-c: ROOT6-DN42 tech-c: ROOT6-DN42 mnt-by: ROOT6-MNT diff --git a/data/dns/rzl b/data/dns/rzl index f504540d3..1af87f8b1 100644 --- a/data/dns/rzl +++ b/data/dns/rzl @@ -1,5 +1,4 @@ domain: rzl -country: DE remarks: ** rzl admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/dns/saintwolf.dn42 b/data/dns/saintwolf.dn42 index 80718e3ee..7e9a8bfa1 100644 --- a/data/dns/saintwolf.dn42 +++ b/data/dns/saintwolf.dn42 @@ -1,5 +1,4 @@ domain: saintwolf.dn42 -country: GB admin-c: SAINTWOLF-DN42 tech-c: SAINTWOLF-DN42 mnt-by: SAINTWOLF-MNT diff --git a/data/dns/sapinet.dn42 b/data/dns/sapinet.dn42 index 663482608..737570285 100644 --- a/data/dns/sapinet.dn42 +++ b/data/dns/sapinet.dn42 @@ -1,5 +1,4 @@ domain: sapinet.dn42 -country: FR admin-c: SAPINET-DN42 tech-c: SAPINET-DN42 mnt-by: SAPINET-MNT diff --git a/data/dns/saturn.dn42 b/data/dns/saturn.dn42 index 5377e7c5b..99247ecb3 100644 --- a/data/dns/saturn.dn42 +++ b/data/dns/saturn.dn42 @@ -1,5 +1,4 @@ domain: saturn.dn42 -country: DE admin-c: CR-DN42 tech-c: CR-DN42 mnt-by: SIS-ORG-MNT diff --git a/data/dns/sbg.dn42 b/data/dns/sbg.dn42 index a676a3698..2d40fe7f0 100644 --- a/data/dns/sbg.dn42 +++ b/data/dns/sbg.dn42 @@ -1,6 +1,5 @@ domain: sbg.dn42 descr: Salzburg -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/sc.dn42 b/data/dns/sc.dn42 index 3ffba96cc..8aee3d939 100644 --- a/data/dns/sc.dn42 +++ b/data/dns/sc.dn42 @@ -1,6 +1,5 @@ domain: sc.dn42 descr: Salzburg Chaostreff -country: AT admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/sebi.dn42 b/data/dns/sebi.dn42 index 73c3049df..e1dd9c74a 100644 --- a/data/dns/sebi.dn42 +++ b/data/dns/sebi.dn42 @@ -1,6 +1,5 @@ domain: sebi.dn42 descr: Sebi's DN42 domain -country: DE nserver: ns.sebi.dn42 172.23.170.1 admin-c: SEBI-DN42 tech-c: SEBI-DN42 diff --git a/data/dns/services.dn42 b/data/dns/services.dn42 index 9e9150680..1a1860963 100644 --- a/data/dns/services.dn42 +++ b/data/dns/services.dn42 @@ -1,5 +1,4 @@ domain: services.dn42 -country: NL admin-c: TRUNET-DN42 tech-c: TRUNET-DN42 mnt-by: TRUNET-MNT diff --git a/data/dns/sidereal.dn42 b/data/dns/sidereal.dn42 index 03ffe2b69..8b7df578e 100644 --- a/data/dns/sidereal.dn42 +++ b/data/dns/sidereal.dn42 @@ -1,5 +1,4 @@ domain: sidereal.dn42 -country: CA admin-c: SIDEREAL-DN42 tech-c: SIDEREAL-DN42 mnt-by: SIDEREAL-MNT diff --git a/data/dns/sighup.dn42 b/data/dns/sighup.dn42 index dadefd1fd..bb878130a 100644 --- a/data/dns/sighup.dn42 +++ b/data/dns/sighup.dn42 @@ -1,5 +1,4 @@ domain: sighup.dn42 -country: DE admin-c: TSYS-DN42 tech-c: TSYS-DN42 mnt-by: TSYS-MNT diff --git a/data/dns/sigterm.dn42 b/data/dns/sigterm.dn42 index 40a6da622..867c14d13 100644 --- a/data/dns/sigterm.dn42 +++ b/data/dns/sigterm.dn42 @@ -1,6 +1,5 @@ domain: sigterm.dn42 descr: GXA -country: US admin-c: GXA-DN42 tech-c: GXA-DN42 mnt-by: GXA-MNT diff --git a/data/dns/sin.dn42 b/data/dns/sin.dn42 index a0672b8cc..78e1e2bbe 100644 --- a/data/dns/sin.dn42 +++ b/data/dns/sin.dn42 @@ -1,7 +1,6 @@ domain: sin.dn42 nserver: pimp.sin.dn42 172.22.16.6 status: EVALPEND 1503918518 -country: DE admin-c: ASTRO-DN42 tech-c: ASTRO-DN42 mnt-by: ASTRO-MNT diff --git a/data/dns/skynet.dn42 b/data/dns/skynet.dn42 index ec6e8b617..037923cb9 100644 --- a/data/dns/skynet.dn42 +++ b/data/dns/skynet.dn42 @@ -1,6 +1,5 @@ domain: skynet.dn42 descr: Skynet domain -country: DE admin-c: IO-DN42 tech-c: IO-DN42 mnt-by: SKYNET-MNT diff --git a/data/dns/sl.dn42 b/data/dns/sl.dn42 index f78940870..c7dbaec61 100644 --- a/data/dns/sl.dn42 +++ b/data/dns/sl.dn42 @@ -1,6 +1,5 @@ domain: sl.dn42 descr: SlothLogistics Main Domain -country: US admin-c: CHARLESTHESLOTH-DN42 tech-c: CHARLESTHESLOTH-DN42 mnt-by: SLOTHLOGISTICS-MNT diff --git a/data/dns/somnet.dn42 b/data/dns/somnet.dn42 index c53d1bc61..7b553a773 100644 --- a/data/dns/somnet.dn42 +++ b/data/dns/somnet.dn42 @@ -1,5 +1,4 @@ domain: somnet.dn42 -country: US admin-c: SOMNET-DN42 tech-c: SOMNET-DN42 mnt-by: SOMNET-MNT diff --git a/data/dns/speedtest.dn42 b/data/dns/speedtest.dn42 index 714a14f6c..e5bfa6b4d 100644 --- a/data/dns/speedtest.dn42 +++ b/data/dns/speedtest.dn42 @@ -1,5 +1,4 @@ domain: speedtest.dn42 -country: NL admin-c: NL-ZUID-DN42 tech-c: NL-ZUID-DN42 mnt-by: MARLINC-MNT diff --git a/data/dns/splash.dn42 b/data/dns/splash.dn42 index cb833dc2a..9074023f7 100644 --- a/data/dns/splash.dn42 +++ b/data/dns/splash.dn42 @@ -1,6 +1,5 @@ domain: splash.dn42 descr: ZANET -country: ZA admin-c: SPLASH-DN42 tech-c: SPLASH-DN42 mnt-by: SPLASH-MNT diff --git a/data/dns/spreitzer.dn42 b/data/dns/spreitzer.dn42 index c894e6864..d09c64700 100644 --- a/data/dns/spreitzer.dn42 +++ b/data/dns/spreitzer.dn42 @@ -1,6 +1,5 @@ domain: spreitzer.dn42 descr: Spreitzer -country: CH admin-c: SPREITZER-DN42 tech-c: SPREITZER-DN42 mnt-by: SPREITZER-MNT diff --git a/data/dns/ssldecoder.dn42 b/data/dns/ssldecoder.dn42 index 37fc75408..432124a54 100644 --- a/data/dns/ssldecoder.dn42 +++ b/data/dns/ssldecoder.dn42 @@ -1,6 +1,5 @@ domain: ssldecoder.dn42 descr: SSL Decoder -country: DE admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 mnt-by: JOMAT-MNT diff --git a/data/dns/storage.dn42 b/data/dns/storage.dn42 index 980fc85f2..cc5a4993f 100644 --- a/data/dns/storage.dn42 +++ b/data/dns/storage.dn42 @@ -1,5 +1,4 @@ domain: storage.dn42 -country: DE admin-c: CR-DN42 tech-c: CR-DN42 mnt-by: SIS-ORG-MNT diff --git a/data/dns/surf.dn42 b/data/dns/surf.dn42 index 1e4ba4d67..8dbb0d755 100644 --- a/data/dns/surf.dn42 +++ b/data/dns/surf.dn42 @@ -1,6 +1,5 @@ domain: surf.dn42 descr: yacy search engine -country: SI admin-c: NIXNODES-DN42 tech-c: NIXNODES-DN42 mnt-by: NIXNODES-MNT diff --git a/data/dns/syso.dn42 b/data/dns/syso.dn42 index 8d79919b4..30de4be85 100644 --- a/data/dns/syso.dn42 +++ b/data/dns/syso.dn42 @@ -1,5 +1,4 @@ domain: syso.dn42 -country: DE admin-c: SYSOFABLAB-DN42 tech-c: SYSOFABLAB-DN42 mnt-by: FABLABBERLIN-MNT diff --git a/data/dns/szf.dn42 b/data/dns/szf.dn42 index 1d9100cc9..3474a8c7a 100644 --- a/data/dns/szf.dn42 +++ b/data/dns/szf.dn42 @@ -1,5 +1,4 @@ domain: szf.dn42 -country: DE admin-c: SZF-DN42 tech-c: SZF-DN42 mnt-by: SZF-MNT diff --git a/data/dns/tal.dn42 b/data/dns/tal.dn42 index 9bd0d7c21..8745f7d03 100644 --- a/data/dns/tal.dn42 +++ b/data/dns/tal.dn42 @@ -1,6 +1,5 @@ domain: tal.dn42 descr: TALs DNS Zone -country: DE admin-c: TAL-DN42 tech-c: TAL-DN42 mnt-by: TAL-MNT diff --git a/data/dns/tbspace.dn42 b/data/dns/tbspace.dn42 index 14c4346c4..0d46ec670 100644 --- a/data/dns/tbspace.dn42 +++ b/data/dns/tbspace.dn42 @@ -1,6 +1,5 @@ domain: tbspace.dn42 descr: main domain -country: DE admin-c: TBSPACE-DN42 tech-c: TBSPACE-DN42 mnt-by: TBSPACE-MNT diff --git a/data/dns/tcc.dn42 b/data/dns/tcc.dn42 index 52348c3ff..a1942d9b6 100644 --- a/data/dns/tcc.dn42 +++ b/data/dns/tcc.dn42 @@ -1,6 +1,5 @@ domain: tcc.dn42 descr: The Computer Crowd -country: US admin-c: CONNOR-DN42 tech-c: CONNOR-DN42 mnt-by: VPSSOLUTIONS-MNT diff --git a/data/dns/tech9.dn42 b/data/dns/tech9.dn42 index 96effe511..76eb3753d 100644 --- a/data/dns/tech9.dn42 +++ b/data/dns/tech9.dn42 @@ -1,6 +1,5 @@ domain: tech9.dn42 descr: TECH9 -country: US admin-c: CHRISMOOS-DN42 tech-c: CHRISMOOS-DN42 mnt-by: TECH9-MNT diff --git a/data/dns/tech9computers.dn42 b/data/dns/tech9computers.dn42 index 470aa4db2..69edbefd8 100644 --- a/data/dns/tech9computers.dn42 +++ b/data/dns/tech9computers.dn42 @@ -1,5 +1,4 @@ domain: tech9computers.dn42 -country: US admin-c: CHRISMOOS-DN42 tech-c: CHRISMOOS-DN42 mnt-by: TECH9-MNT diff --git a/data/dns/test123.dn42 b/data/dns/test123.dn42 index 08368538e..aed56be58 100644 --- a/data/dns/test123.dn42 +++ b/data/dns/test123.dn42 @@ -1,6 +1,5 @@ domain: test123.dn42 descr: test domain -country: NL admin-c: AIM333-DN42 tech-c: AIM333-DN42 mnt-by: AIM333-MNT diff --git a/data/dns/to.dn42 b/data/dns/to.dn42 index cbd4bc2b5..7fb9f4676 100644 --- a/data/dns/to.dn42 +++ b/data/dns/to.dn42 @@ -1,6 +1,5 @@ domain: to.dn42 descr: ASoT URL Shortener -country: CA admin-c: HEAVYMETAL-DN42 tech-c: HEAVYMETAL-DN42 mnt-by: ASOTNET-MNT diff --git a/data/dns/tombii.dn42 b/data/dns/tombii.dn42 index 103a31deb..dd6f8592b 100644 --- a/data/dns/tombii.dn42 +++ b/data/dns/tombii.dn42 @@ -1,5 +1,4 @@ domain: tombii.dn42 -country: SE admin-c: TOMBII-DN42 tech-c: TOMBII-DN42 mnt-by: TOMBII-DN42-MNT diff --git a/data/dns/tor.dn42 b/data/dns/tor.dn42 index ac9469e05..90ea73e64 100644 --- a/data/dns/tor.dn42 +++ b/data/dns/tor.dn42 @@ -1,5 +1,4 @@ domain: tor.dn42 -country: PL admin-c: DRIXTER-DN42 tech-c: DRIXTER-DN42 mnt-by: DRIXTER-MNT diff --git a/data/dns/torrent.dn42 b/data/dns/torrent.dn42 index 1a081f440..fd61ee5fc 100644 --- a/data/dns/torrent.dn42 +++ b/data/dns/torrent.dn42 @@ -1,6 +1,5 @@ domain: torrent.dn42 descr: Torrent -country: DE admin-c: TOBEE-DN42 tech-c: TOBEE-DN42 mnt-by: BLAZING-MNT diff --git a/data/dns/torrents.dn42 b/data/dns/torrents.dn42 index 4c07edcfb..fcc7278e4 100644 --- a/data/dns/torrents.dn42 +++ b/data/dns/torrents.dn42 @@ -1,6 +1,5 @@ domain: torrents.dn42 descr: Torrent -country: DE admin-c: TOBEE-DN42 tech-c: TOBEE-DN42 mnt-by: BLAZING-MNT diff --git a/data/dns/tracker.dn42 b/data/dns/tracker.dn42 index d4cae73be..7a7edf623 100644 --- a/data/dns/tracker.dn42 +++ b/data/dns/tracker.dn42 @@ -1,6 +1,5 @@ domain: tracker.dn42 descr: Torrent Tracker RRDNS -country: DE admin-c: GRMML-DN42 tech-c: GRMML-DN42 mnt-by: GRMML-MNT diff --git a/data/dns/trunet.dn42 b/data/dns/trunet.dn42 index 60371dde1..3e26e814e 100644 --- a/data/dns/trunet.dn42 +++ b/data/dns/trunet.dn42 @@ -1,6 +1,5 @@ domain: trunet.dn42 descr: Trunet DN42 Domain -country: NL admin-c: TRUNET-DN42 tech-c: TRUNET-DN42 mnt-by: TRUNET-MNT diff --git a/data/dns/tsys.dn42 b/data/dns/tsys.dn42 index 2eef8d115..fdc180cd5 100644 --- a/data/dns/tsys.dn42 +++ b/data/dns/tsys.dn42 @@ -1,5 +1,4 @@ domain: tsys.dn42 -country: DE admin-c: TSYS-DN42 tech-c: TSYS-DN42 mnt-by: TSYS-MNT diff --git a/data/dns/ttygap.dn42 b/data/dns/ttygap.dn42 index 6ba3bc70f..8ef854348 100644 --- a/data/dns/ttygap.dn42 +++ b/data/dns/ttygap.dn42 @@ -1,5 +1,4 @@ domain: ttygap.dn42 -country: DE org: ORG-TTYGAP admin-c: BANDIE-DN42 tech-c: BANDIE-DN42 diff --git a/data/dns/typhon.dn42 b/data/dns/typhon.dn42 index a5588edfe..148bb75a9 100644 --- a/data/dns/typhon.dn42 +++ b/data/dns/typhon.dn42 @@ -1,5 +1,4 @@ domain: typhon.dn42 -country: DE admin-c: TYPHON-DN42 tech-c: TYPHON-DN42 mnt-by: TYPHON-MNT diff --git a/data/dns/unbedenklich.dn42 b/data/dns/unbedenklich.dn42 index fc28873f5..e08017b76 100644 --- a/data/dns/unbedenklich.dn42 +++ b/data/dns/unbedenklich.dn42 @@ -1,6 +1,5 @@ domain: unbedenklich.dn42 descr: UNBEDENKLICH domain -country: DE admin-c: UNBEDENKLICH-DN42 tech-c: UNBEDENKLICH-DN42 mnt-by: UNBEDENKLICH-MNT diff --git a/data/dns/unixbros.dn42 b/data/dns/unixbros.dn42 index 2cdc5ddb3..0d08226ec 100644 --- a/data/dns/unixbros.dn42 +++ b/data/dns/unixbros.dn42 @@ -1,6 +1,5 @@ domain: unixbros.dn42 descr: Domain for true bros! -country: FR admin-c: Z3BRA-DN42 tech-c: Z3BRA-DN42 mnt-by: UNIXBROS-MNT diff --git a/data/dns/uu.dn42 b/data/dns/uu.dn42 index bcf41f804..57fdbd322 100644 --- a/data/dns/uu.dn42 +++ b/data/dns/uu.dn42 @@ -1,5 +1,4 @@ domain: uu.dn42 -country: DE admin-c: WUSEL-DN42 tech-c: WUSEL-DN42 mnt-by: WUSEL-MNT diff --git a/data/dns/vitalenetworks.dn42 b/data/dns/vitalenetworks.dn42 index 4d1fab29c..aa6cd6289 100644 --- a/data/dns/vitalenetworks.dn42 +++ b/data/dns/vitalenetworks.dn42 @@ -1,6 +1,5 @@ domain: vitalenetworks.dn42 descr: Vitale Networks -country: NL org: ORG-VITALE admin-c: SCARLET-DN42 tech-c: SCARLET-DN42 diff --git a/data/dns/voidptr.dn42 b/data/dns/voidptr.dn42 index b5f63acc8..0d7dd0c64 100644 --- a/data/dns/voidptr.dn42 +++ b/data/dns/voidptr.dn42 @@ -3,6 +3,5 @@ status: EVALPEND 1503919182 admin-c: VOIDPTR-DN42 tech-c: VOIDPTR-DN42 mnt-by: VOIDPTR-MNT -country: DE nserver: algi.voidptr.dn42 fd42:8700:90::a161 nserver: algi.voidptr.dn42 172.23.173.185 diff --git a/data/dns/w0h.dn42 b/data/dns/w0h.dn42 index 098d3f94f..e5b91b80e 100644 --- a/data/dns/w0h.dn42 +++ b/data/dns/w0h.dn42 @@ -1,5 +1,4 @@ domain: w0h.dn42 -country: DE admin-c: W0H-DN42 tech-c: W0H-DN42 mnt-by: W0H-MNT diff --git a/data/dns/webtorrent.dn42 b/data/dns/webtorrent.dn42 index 43fdaf370..567be4f3b 100644 --- a/data/dns/webtorrent.dn42 +++ b/data/dns/webtorrent.dn42 @@ -1,6 +1,5 @@ domain: webtorrent.dn42 descr: Deluge webtorrent 500GB Disk / 100 GB daily traffic limit -country: DE admin-c: MIC92-DN42 tech-c: MIC92-DN42 mnt-by: MIC92-MNT diff --git a/data/dns/weiti.dn42 b/data/dns/weiti.dn42 index bbf1b724b..c547160e5 100644 --- a/data/dns/weiti.dn42 +++ b/data/dns/weiti.dn42 @@ -1,6 +1,5 @@ domain: weiti.dn42 descr: WEITI Domain -country: DE admin-c: WEITI-DN42 tech-c: WEITI-DN42 mnt-by: WEITI-MNT diff --git a/data/dns/whatismyip.dn42 b/data/dns/whatismyip.dn42 index 3a8f08fbc..72580c522 100644 --- a/data/dns/whatismyip.dn42 +++ b/data/dns/whatismyip.dn42 @@ -1,5 +1,4 @@ domain: whatismyip.dn42 -country: US admin-c: CHRISMOOS-DN42 tech-c: CHRISMOOS-DN42 mnt-by: TECH9-MNT diff --git a/data/dns/whatsmyip.dn42 b/data/dns/whatsmyip.dn42 index e2b3fda25..be8e82f20 100644 --- a/data/dns/whatsmyip.dn42 +++ b/data/dns/whatsmyip.dn42 @@ -1,5 +1,4 @@ domain: whatsmyip.dn42 -country: DE admin-c: TSYS-DN42 tech-c: TSYS-DN42 mnt-by: TSYS-MNT diff --git a/data/dns/whs.dn42 b/data/dns/whs.dn42 index 5464943b8..274dc23a9 100644 --- a/data/dns/whs.dn42 +++ b/data/dns/whs.dn42 @@ -1,5 +1,4 @@ domain: whs.dn42 -country: TH admin-c: WHS-DN42 tech-c: WHS-DN42 mnt-by: WHS-MNT diff --git a/data/dns/wieistmeineip.dn42 b/data/dns/wieistmeineip.dn42 index 9cc54d973..9de7629a4 100644 --- a/data/dns/wieistmeineip.dn42 +++ b/data/dns/wieistmeineip.dn42 @@ -1,5 +1,4 @@ domain: wieistmeineip.dn42 -country: DE admin-c: TSYS-DN42 tech-c: TSYS-DN42 mnt-by: TSYS-MNT diff --git a/data/dns/wolf.dn42 b/data/dns/wolf.dn42 index cef542814..8f4f78ec8 100644 --- a/data/dns/wolf.dn42 +++ b/data/dns/wolf.dn42 @@ -1,6 +1,5 @@ domain: wolf.dn42 descr: WhiteWolf's DNS -country: ZA admin-c: WOLF-DN42 tech-c: WOLF-DN42 mnt-by: WOLF-MNT diff --git a/data/dns/xiaoyu.dn42 b/data/dns/xiaoyu.dn42 index ce1c62ef0..a92e17ba0 100644 --- a/data/dns/xiaoyu.dn42 +++ b/data/dns/xiaoyu.dn42 @@ -1,6 +1,5 @@ domain: xiaoyu.dn42 descr: xiaoyu-net -country: US admin-c: XIAOYU-DN42 tech-c: XIAOYU-DN42 mnt-by: XIAOYU-MNT diff --git a/data/dns/xmpp.dn42 b/data/dns/xmpp.dn42 index d0ae4001e..e26d433c5 100644 --- a/data/dns/xmpp.dn42 +++ b/data/dns/xmpp.dn42 @@ -1,6 +1,5 @@ domain: xmpp.dn42 descr: Jabber / XMPP Service -country: DE admin-c: GRMML-DN42 tech-c: GRMML-DN42 mnt-by: GRMML-MNT diff --git a/data/dns/yacy.dn42 b/data/dns/yacy.dn42 index 6cfe168d7..eccbe8c1b 100644 --- a/data/dns/yacy.dn42 +++ b/data/dns/yacy.dn42 @@ -1,6 +1,5 @@ domain: yacy.dn42 descr: YaCy Search -country: PL admin-c: DRIXTER-DN42 tech-c: DRIXTER-DN42 mnt-by: DRIXTER-MNT diff --git a/data/dns/zeitgeist.dn42 b/data/dns/zeitgeist.dn42 index 5b44d4f0a..1fe8d83cb 100644 --- a/data/dns/zeitgeist.dn42 +++ b/data/dns/zeitgeist.dn42 @@ -1,5 +1,4 @@ domain: zeitgeist.dn42 -country: DE admin-c: W0H-DN42 tech-c: W0H-DN42 mnt-by: W0H-MNT diff --git a/data/dns/zer0.dn42 b/data/dns/zer0.dn42 index ae170f089..cb5fd7023 100644 --- a/data/dns/zer0.dn42 +++ b/data/dns/zer0.dn42 @@ -1,6 +1,5 @@ domain: zer0.dn42 descr: Playground -country: RU admin-c: ALIANSE77-DN42 mnt-by: ALIANSE77-MNT tech-c: ALIANSE77-DN42 diff --git a/data/dns/znc.dn42 b/data/dns/znc.dn42 index e1bc79d93..7a5617e6a 100644 --- a/data/dns/znc.dn42 +++ b/data/dns/znc.dn42 @@ -1,6 +1,5 @@ domain: znc.dn42 descr: IRC Bouncer Service -country: DE admin-c: GRMML-DN42 tech-c: GRMML-DN42 mnt-by: GRMML-MNT diff --git a/data/organisation/ORG-C3D2 b/data/organisation/ORG-C3D2 index b99efff1c..b070aa855 100644 --- a/data/organisation/ORG-C3D2 +++ b/data/organisation/ORG-C3D2 @@ -5,6 +5,6 @@ admin-c: ASTRO-DN42 tech-c: ERI-DN42 mnt-by: ERI-MNT phone: +4935148484999 -bitcoin: 1GCHQcmWcyCa3tJnoeZCy5ePpkQK7xnJ1R +remarks: bitcoin: 1GCHQcmWcyCa3tJnoeZCy5ePpkQK7xnJ1R e-mail: mail@c3d2.de www: https://c3d2.de diff --git a/data/organisation/ORG-SIGTERM-NO-RIPE b/data/organisation/ORG-SIGTERM-NO-RIPE index 85e0e14c0..9159732b7 100644 --- a/data/organisation/ORG-SIGTERM-NO-RIPE +++ b/data/organisation/ORG-SIGTERM-NO-RIPE @@ -1,7 +1,7 @@ organisation: ORG-SIGTERM-NO-RIPE org-name: Sigterm.no descr: Sigerm -bitcoin: 1LoveJttCUrrjwHxntwUp6PeEvL2UkFyWp +remarks: bitcoin: 1LoveJttCUrrjwHxntwUp6PeEvL2UkFyWp admin-c: SIGTERM-DN42 tech-c: SIGTERM-DN42 mnt-by: GREYHAT-SIGTERM-NO-MNT diff --git a/data/person/3DFXATWORK-DN42 b/data/person/3DFXATWORK-DN42 index f6c7d006e..5eeb44d4f 100644 --- a/data/person/3DFXATWORK-DN42 +++ b/data/person/3DFXATWORK-DN42 @@ -1,7 +1,6 @@ person: 3dfxatwork contact: xmpp:3dfx@3dfxatwork.de pgp-fingerprint: 3602 5F25 868F 8B88 1A68 B827 C9D2 F51B CB46 7E04 -pgp-id: CB467E04 e-mail: freifunk@3dfxatwork.de nic-hdl: 3DFXATWORK-DN42 mnt-by: FREIFUNK-HALLE-MNT diff --git a/data/person/3STADT-DN42 b/data/person/3STADT-DN42 index 9b646df44..81ed2e657 100644 --- a/data/person/3STADT-DN42 +++ b/data/person/3STADT-DN42 @@ -1,6 +1,5 @@ person: 3-Stadt nic-hdl: 3STADT-DN42 e-mail: dn42@3-stadt.de -pgp-id: EA8A414C pgp-fingerprint: DE87 69DF 2BB6 B648 7AED AAAE FEED 9DAE EA8A 414C mnt-by: 3STADT-MNT diff --git a/data/person/ADRA-DN42 b/data/person/ADRA-DN42 index bef8ecbdb..99f399f94 100644 --- a/data/person/ADRA-DN42 +++ b/data/person/ADRA-DN42 @@ -4,6 +4,5 @@ contact: irc:adraenwan@hackint contact: irc:adraenwan@freenode contact: xmpp:adraenwan@tfnux.org nic-hdl: ADRA-DN42 -pgp-id: 0xADDD300A pgp-fingerprint: C537 5172 5FA1 3D4C AB11 89FC AD35 F402 ADDD 300A mnt-by: ADRA-MNT diff --git a/data/person/ALARIG-DN42 b/data/person/ALARIG-DN42 index 1a6a7ebd8..4db0a373b 100644 --- a/data/person/ALARIG-DN42 +++ b/data/person/ALARIG-DN42 @@ -1,7 +1,6 @@ person: alarig contact: alarig@swordarmor.fr contact: xmpp:alarig@gozmail.net -pgp-id: 0x6B202B88 pgp-fingerprint: FB6C 86C1 3D07 D27E 7B5A 445B AF38 4AC1 6B20 2B88 www: https://www.swordarmor.fr/ nic-hdl: ALARIG-DN42 diff --git a/data/person/ALICEWL-DN42 b/data/person/ALICEWL-DN42 index 8476dfe5d..9bbff81a2 100644 --- a/data/person/ALICEWL-DN42 +++ b/data/person/ALICEWL-DN42 @@ -2,5 +2,4 @@ person: alice|wl nic-hdl: ALICEWL-DN42 e-mail: alice@notomorrow.de pgp-fingerprint: 530B 30AC 9E40 7452 BF94 3C0A BFCA C06C 9374 6141 -pgp-id: 93746141 mnt-by: ALICE-DN42-MNT diff --git a/data/person/ARENDTSEN-DN42 b/data/person/ARENDTSEN-DN42 index a7f0ee00b..d70b403b6 100644 --- a/data/person/ARENDTSEN-DN42 +++ b/data/person/ARENDTSEN-DN42 @@ -3,6 +3,5 @@ contact: irc: arendtsen@hackint nic-hdl: ARENDTSEN-DN42 mnt-by: ARENDTSEN-MNT e-mail: martin@dn42.dk -pgp-id: 07E01E37 pgp-fingerprint: ABE0 27E5 1ECD AD0C 56F4 D207 4B05 E5B4 07E0 1E37 abuse-mailbox: abuse@dn42.dk diff --git a/data/person/BANDIE-DN42 b/data/person/BANDIE-DN42 index 2cf567d6d..8e8d4f9b2 100644 --- a/data/person/BANDIE-DN42 +++ b/data/person/BANDIE-DN42 @@ -1,7 +1,6 @@ person: Bandie Yip Kojote contact: xmpp:bandie@ttygap.net e-mail: bandie@ttygap.net -pgp-id: 0xC2942643 pgp-fingerprint: 633EE147F1BB38285E4B72E8BA701DD8C2942643 nic-hdl: BANDIE-DN42 mnt-by: BANDIE-MNT diff --git a/data/person/BDR-DN42 b/data/person/BDR-DN42 index dbc3b25af..b3a98a2fc 100644 --- a/data/person/BDR-DN42 +++ b/data/person/BDR-DN42 @@ -1,6 +1,5 @@ person: BDR-DN42 contact: rodekb@gmail.com nic-hdl: BDR-DN42 -pgp-id: 0xEC88CBD7 pgp-fingerprint: E272 B2CE BCAF 8FB1 64C7 3489 7CF2 135A EC88 CBD7 mnt-by: BDR-MNT diff --git a/data/person/BERKAY-DN42 b/data/person/BERKAY-DN42 index dc2c67d96..a9a9d7173 100644 --- a/data/person/BERKAY-DN42 +++ b/data/person/BERKAY-DN42 @@ -2,5 +2,4 @@ person: Berkay contact: berkay@cagir.me nic-hdl: BERKAY-DN42 www: https://tilde.red/~berkay -pgp-id: 0xe1c2fd64f72742b0 mnt-by: BERKAY-MNT diff --git a/data/person/BR-DN42 b/data/person/BR-DN42 index 5b795ddc9..6cafa33d4 100644 --- a/data/person/BR-DN42 +++ b/data/person/BR-DN42 @@ -3,5 +3,4 @@ nic-hdl: BR-DN42 mnt-by: BR-MNT contact: irc: wbr@hackint e-mail: wsunet@live.com -pgp-id: 7B972F6C pgp-fingerprint: 21A5 0F26 164A B929 78FD DBB0 E1DD 6308 7B97 2F6C diff --git a/data/person/BYRN-DN42 b/data/person/BYRN-DN42 index 971244c68..be642e949 100644 --- a/data/person/BYRN-DN42 +++ b/data/person/BYRN-DN42 @@ -2,5 +2,4 @@ person: BYRN contact: byrn.baker@gmail.com nic-hdl: BYRN-DN42 mnt-by: BYRN-MNT -pgp-id: 0xA17C2C3D address: eu.byrnbaker.me (DE), us.byrnbaker.me (NYC), ca1.byrnbaker.me (CA) diff --git a/data/person/CAPS-DN42 b/data/person/CAPS-DN42 index fbedde357..c9507ab73 100644 --- a/data/person/CAPS-DN42 +++ b/data/person/CAPS-DN42 @@ -2,5 +2,4 @@ person: Caps contact: dn42@legeox.net nic-hdl: CAPS-DN42 mnt-by: CAPS-MNT -pgp-id: 0x35F858B4 pgp-fingerprint: FDFE DC0C 6A7A 3E3F 007B C2FE A106 05B2 35F8 58B4 diff --git a/data/person/CATOFES-DN42 b/data/person/CATOFES-DN42 index 0024e578e..c5d845af8 100644 --- a/data/person/CATOFES-DN42 +++ b/data/person/CATOFES-DN42 @@ -1,5 +1,4 @@ person: Hao Qiao contact: dn42@catofes.com -pgp-id: DE6EA2EC nic-hdl: CATOFES-DN42 mnt-by: CATOFES-MNT diff --git a/data/person/CHALLENE-DN42 b/data/person/CHALLENE-DN42 index 9f67292fd..2a3b0d665 100644 --- a/data/person/CHALLENE-DN42 +++ b/data/person/CHALLENE-DN42 @@ -1,6 +1,5 @@ person: CHALLENE-DN42 contact: irc:challene@dn42 pgp-fingerprint: 39DB AB88 BF8F BA30 37CA 833D EA24 4A92 298A 5D68 -pgp-id: 298A5D68 nic-hdl: CHALLENE-DN42 mnt-by: CHALLENE-MNT diff --git a/data/person/CHRISMOOS-DN42 b/data/person/CHRISMOOS-DN42 index d8d63828b..411768263 100644 --- a/data/person/CHRISMOOS-DN42 +++ b/data/person/CHRISMOOS-DN42 @@ -3,4 +3,3 @@ contact: chris@tech9computers.com nic-hdl: CHRISMOOS-DN42 mnt-by: TECH9-MNT pgp-fingerprint: 9125 817B 7FB3 41A5 7341 ADF8 5761 5E34 BF5E 897B -pgp-id: BF5E897B diff --git a/data/person/CS1972-DN42 b/data/person/CS1972-DN42 index 5727629bd..28fc2868e 100644 --- a/data/person/CS1972-DN42 +++ b/data/person/CS1972-DN42 @@ -1,6 +1,5 @@ person: CS1972 contact: mailto:dn42@dd-wrt.com -pgp-id: 1C945E6C pgp-fingerprint: B223 6566 4099 4FC1 BF93 62B7 259B EE33 1C94 5E6C nic-hdl: CS1972-DN42 mnt-by: CS1972-MNT diff --git a/data/person/CYCLOPTIVITY-DN42 b/data/person/CYCLOPTIVITY-DN42 index bec17c7af..cca11ab19 100644 --- a/data/person/CYCLOPTIVITY-DN42 +++ b/data/person/CYCLOPTIVITY-DN42 @@ -1,7 +1,6 @@ person: CYCLOPTIVITY-DN42 nic-hdl: CYCLOPTIVITY-DN42 remarks: In stasis 20151205 -pgp-id: http://www.cycloptivity.net/6E03FC34.txt pgp-fingerprint: 384A BA8C CDAE 1969 8198 4635 316D 9601 6E03 FC34 mnt-by: CYCLOPTIVITY-MNT e-mail: swilsonau@gmail.com diff --git a/data/person/DARKIT-DN42 b/data/person/DARKIT-DN42 index c00abf251..c1abaa526 100644 --- a/data/person/DARKIT-DN42 +++ b/data/person/DARKIT-DN42 @@ -2,7 +2,6 @@ person: Sammy nic-hdl: DARKIT-DN42 www: http://dark-it.dn42 mnt-by: DARKIT-MNT -pgp-id: E7A4B302 pgp-fingerprint: F07F 6E73 15DD 2587 F300 3B22 0769 EC6D E7A4 B302 contact: xmpp: steven@dark-it.net contact: irc: sammy@hackint diff --git a/data/person/DERF-DN42 b/data/person/DERF-DN42 index fe8417360..25ee7f304 100644 --- a/data/person/DERF-DN42 +++ b/data/person/DERF-DN42 @@ -3,5 +3,4 @@ e-mail: derf+dn42@finalrewind.org contact: irc:derf0@hackint contact: xmpp:derf@tabularazor.org nic-hdl: DERF-DN42 -pgp-id: 0x5166E005 mnt-by: DERF-MNT diff --git a/data/person/DOMINIKH-DN42 b/data/person/DOMINIKH-DN42 index f02ec7169..3d407251e 100644 --- a/data/person/DOMINIKH-DN42 +++ b/data/person/DOMINIKH-DN42 @@ -1,5 +1,4 @@ person: dominikh nic-hdl: DOMINIKH-DN42 e-mail: dn42@fork-bomb.org -pgp-id: 8D4B0ED7 mnt-by: DOMINIKH-MNT diff --git a/data/person/DRACOLING-DN42 b/data/person/DRACOLING-DN42 index 2414b76c7..c6a711b63 100644 --- a/data/person/DRACOLING-DN42 +++ b/data/person/DRACOLING-DN42 @@ -1,7 +1,6 @@ person: dracoling contact: mail:dracoling@gmail.com contact: xmpp:dracoling@gmail.com -pgp-id: C6E5F34F pgp-fingerprint: F3E1 D5BD 448E 0097 63BB 2249 7E08 F4AD C6E5 F34F nic-hdl: DRACOLING-DN42 mnt-by: DUMMY-MNT diff --git a/data/person/ERI-DN42 b/data/person/ERI-DN42 index 0997ecc2e..c353b2d71 100644 --- a/data/person/ERI-DN42 +++ b/data/person/ERI-DN42 @@ -1,6 +1,5 @@ person: eri! contact: mailto:eri@chelnok.de -pgp-id: 65F349F2 pgp-fingerprint: 8442 67BA 729E 32B3 329B 9DBF 59E2 38FC 65F3 49F2 contact: xmpp:eri@jabber.chelnok.de nic-hdl: ERI-DN42 diff --git a/data/person/F0X-DN42 b/data/person/F0X-DN42 index ed965ba01..ec955acee 100644 --- a/data/person/F0X-DN42 +++ b/data/person/F0X-DN42 @@ -1,5 +1,4 @@ person: Felix S. contact: twitter: @mon0li -pgp-id: 50B2099D nic-hdl: F0X-DN42 mnt-by: F0X-MNT diff --git a/data/person/FANIR-DN42 b/data/person/FANIR-DN42 index 4d51a44ba..37199dfbf 100644 --- a/data/person/FANIR-DN42 +++ b/data/person/FANIR-DN42 @@ -3,6 +3,5 @@ contact: irc:fanir@irc.fanir.de contact: irc:fanir@hackint contact: xmpp:fanir@zom.bi e-mail: fanir+dn42@tigris.fanir.de -pgp-id: 3DF447FCAA131985 nic-hdl: FANIR-DN42 mnt-by: FANIR-MNT diff --git a/data/person/FEUERROT-DN42 b/data/person/FEUERROT-DN42 index 8c35f2319..a020505e6 100644 --- a/data/person/FEUERROT-DN42 +++ b/data/person/FEUERROT-DN42 @@ -3,6 +3,5 @@ e-mail: feuerrot@feuerrot.org contact: irc:feuerrot@hackint contact: xmpp:feuerrot@jabber.ccc.de nic-hdl: FEUERROT-DN42 -pgp-id: 0x00008ACD pgp-fingerprint: 95E1 48F9 2EBD 49C3 D536 CA0D B669 293D 0000 8ACD mnt-by: FEUERROT-MNT diff --git a/data/person/FISIX-DN42 b/data/person/FISIX-DN42 index 403eea630..8b40ee2e7 100644 --- a/data/person/FISIX-DN42 +++ b/data/person/FISIX-DN42 @@ -2,4 +2,4 @@ person: kossy contact: kosssy@gmail.com nic-hdl: FISIX-DN42 mnt-by: FISIX-MNT -bitcoin: 16EaNoccuPo4sNALbPQHcAjm7G3FYJ25Nh +remarks: bitcoin: 16EaNoccuPo4sNALbPQHcAjm7G3FYJ25Nh diff --git a/data/person/FOERTEL-DN42 b/data/person/FOERTEL-DN42 index fbd9d6f38..f81d48798 100644 --- a/data/person/FOERTEL-DN42 +++ b/data/person/FOERTEL-DN42 @@ -2,7 +2,6 @@ person: Felix Oertel contact: routing@foertel.com contact: xmpp:foertel@jabber.ccc.de contact: irc:wiflix@hackint -pgp-id: 0xF9BAA80E pgp-fingerprint: 7F19 847C 6E1B E0EC EBA2 F0EE 4CE2 41F0 F9BA A80E nic-hdl: FOERTEL-DN42 mnt-by: FOERTEL-MNT diff --git a/data/person/FPLETZ-DN42 b/data/person/FPLETZ-DN42 index b0d36b2ee..a761f3124 100644 --- a/data/person/FPLETZ-DN42 +++ b/data/person/FPLETZ-DN42 @@ -2,5 +2,4 @@ person: fpletz e-mail: fpletz@fnordicwalking.de nic-hdl: FPLETZ-DN42 mnt-by: FPLETZ-MNT -pgp-id: 44BC94A3 pgp-fingerprint: 4A9C 138B 34D2 A1CD 4B24 80A4 0367 7810 44BC 94A3 diff --git a/data/person/GBE-DN42 b/data/person/GBE-DN42 index 572028c98..8ad2b1885 100644 --- a/data/person/GBE-DN42 +++ b/data/person/GBE-DN42 @@ -1,7 +1,6 @@ person: Gregor (gbe/farhaven) Best contact: irc:farhaven@hackint, xmpp:farhaven@potential-terrorist.com nic-hdl: GBE-DN42 -pgp-id: 0xDB9F9A7C mnt-by: GBE-MNT e-mail: gbe+dn42@unobtanium.de www: http://lg.gbe.dn42 diff --git a/data/person/GIGA-DN42 b/data/person/GIGA-DN42 index 046dd0d79..0c2e106e3 100644 --- a/data/person/GIGA-DN42 +++ b/data/person/GIGA-DN42 @@ -3,6 +3,5 @@ nic-hdl: GIGA-DN42 e-mail: dn42@five-ey.es abuse-mailbox: abuse@revreso.de contact: xmpp:gigadoc2@revreso.de -pgp-id: 422DE3FA pgp-fingerprint: B467666A0885B5BB5AF4ADE2294E289D422DE3FA mnt-by: GIGA-MNT diff --git a/data/person/GRMML-DN42 b/data/person/GRMML-DN42 index 8963f9d16..d1a6642ae 100644 --- a/data/person/GRMML-DN42 +++ b/data/person/GRMML-DN42 @@ -2,7 +2,6 @@ person: Nurtic-Vibe contact: nurtic-vibe@grmml.net contact: xmpp: nurtic-vibe@jabber.ffrn.de contact: irc: nurtic-vibe@hackint -pgp-id: F0BAC5F1 pgp-fingerprint: 344D 6549 B645 3198 943B 00BA CAC9 B858 F0BA C5F1 nic-hdl: GRMML-DN42 mnt-by: GRMML-MNT diff --git a/data/person/HAX404-DN42 b/data/person/HAX404-DN42 index 782fe9325..0518c3162 100644 --- a/data/person/HAX404-DN42 +++ b/data/person/HAX404-DN42 @@ -2,7 +2,6 @@ person: HAX404 e-mail: hax404foodn42@hax404.de contact: irc:hax404@hackint contact: xmpp:hax404@jabber.noname-ev.de -pgp-id: 0x4D6E0C81 pgp-fingerprint: 8D3E 1A68 8FCC A0B2 A2D8 650B B2D0 65AD 4D6E 0C81 mnt-by: HAX404-MNT nic-hdl: HAX404-DN42 diff --git a/data/person/HEJ-DN42 b/data/person/HEJ-DN42 index 536cdf9ac..f527cc6d0 100644 --- a/data/person/HEJ-DN42 +++ b/data/person/HEJ-DN42 @@ -1,6 +1,5 @@ person: HeJ contact: hej@c3pb.de contact: irc:HeJ@hackint -pgp-id: 5632E1FC nic-hdl: HEJ-DN42 mnt-by: HEJ-MNT diff --git a/data/person/HNRD-DN42 b/data/person/HNRD-DN42 index c320f312c..867093d68 100644 --- a/data/person/HNRD-DN42 +++ b/data/person/HNRD-DN42 @@ -1,5 +1,4 @@ person: hansenerd e-mail: cg@zknt.org -pgp-id: 0x6671B37E60837A90 nic-hdl: HNRD-DN42 mnt-by: ZKNT-MNT diff --git a/data/person/HX-DN42 b/data/person/HX-DN42 index b2e291a2f..4c0823dbf 100644 --- a/data/person/HX-DN42 +++ b/data/person/HX-DN42 @@ -1,5 +1,4 @@ person: Howard Xiao contact: h+dn42@dargasea.com -pgp-id: 0x0f2301d45e640453 nic-hdl: HX-DN42 mnt-by: DGS-MNT diff --git a/data/person/ICECREAM-DN42 b/data/person/ICECREAM-DN42 index 914ea1bef..5e9aa8cd3 100644 --- a/data/person/ICECREAM-DN42 +++ b/data/person/ICECREAM-DN42 @@ -1,5 +1,5 @@ person: icecream contact: irc:icecream/icetea@freenode -bitcoin: 1GP3wsmgmGPp2xw3HbSEE5DrKN9tdZYxJx +remarks: bitcoin: 1GP3wsmgmGPp2xw3HbSEE5DrKN9tdZYxJx nic-hdl: ICECREAM-DN42 mnt-by: ICECREAM-MNT diff --git a/data/person/JAN-DN42 b/data/person/JAN-DN42 index 859e859c4..e324ec1c7 100644 --- a/data/person/JAN-DN42 +++ b/data/person/JAN-DN42 @@ -1,7 +1,6 @@ person: Jan-Eric e-mail: janeric@ortgies.it contact: janeric@hackint -pgp-id: 0642DF6F pgp-fingerprint: BCD8 2B6C 729A 931C 8CB3 82E5 864F 5B9B 0642 DF6F nic-hdl: JAN-DN42 mnt-by: JAN-MNT diff --git a/data/person/JCIX-DN42 b/data/person/JCIX-DN42 index c7968d08f..107c8c3ae 100644 --- a/data/person/JCIX-DN42 +++ b/data/person/JCIX-DN42 @@ -1,6 +1,5 @@ person: jchome contact: xmpp:jchome@jabber.eof.name e-mail: jchome+dn42@jc-ix.net -pgp-id: F5A02314 nic-hdl: JCIX-DN42 mnt-by: JCIX-MNT diff --git a/data/person/JPLITZA-DN42 b/data/person/JPLITZA-DN42 index a1b2a2ddf..3eb315770 100644 --- a/data/person/JPLITZA-DN42 +++ b/data/person/JPLITZA-DN42 @@ -1,7 +1,6 @@ person: Jan-Philipp Litza contact: mailto:janphilipp@litza.de contact: xmpp:janphilipp@litza.de -pgp-id: 0xB17F2106D8CCEC27 pgp-fingerprint: D7E7 2BFC 9E13 3E04 52DA FBCB B17F 2106 D8CC EC27 www: http://jplitza.de/ nic-hdl: JPLITZA-DN42 diff --git a/data/person/LIFEHOME-DN42 b/data/person/LIFEHOME-DN42 index 9c9a38d71..0e3fca4c6 100644 --- a/data/person/LIFEHOME-DN42 +++ b/data/person/LIFEHOME-DN42 @@ -4,5 +4,4 @@ mnt-by: LIFEDIO-MNT e-mail: m@lifeho.me phone: +85252180135 www: https://lifeho.me -pgp-id: 56D7BEF6 pgp-fingerprint: 8248 46E2 166F 8EEE DB94 301B CD6B 42C3 56D7 BEF6 diff --git a/data/person/LOSTDERPWITCH-DN42 b/data/person/LOSTDERPWITCH-DN42 index d440860e0..83e804834 100644 --- a/data/person/LOSTDERPWITCH-DN42 +++ b/data/person/LOSTDERPWITCH-DN42 @@ -2,7 +2,6 @@ person: LOSTDERPWITCH-DN42 contact: irc:lanodan@hackint e-mail: contact@hacktivis.me www: http://hacktivis.me -pgp-id: 4BBE BBAD pgp-fingerprint: 8E4B AA5E E6FB D5A8 D04F 3BE5 C873 8479 4BBE BBAD nic-hdl: LOSTDERPWITCH-DN42 mnt-by: LOSTDERPWITCH-MNT diff --git a/data/person/LOSTNOC-DN42 b/data/person/LOSTNOC-DN42 index d7df19049..640394221 100644 --- a/data/person/LOSTNOC-DN42 +++ b/data/person/LOSTNOC-DN42 @@ -2,5 +2,4 @@ person: LOSTSERVER.NET NOC contact: noc@lostserver.net nic-hdl: LOSTNOC-DN42 mnt-by: LOSTSERVER-MNT -pgp-id: 0x92D6C7BA pgp-fingerprint: FBC3 9251 95F4 5A33 98DF 5B42 DA2B AF4C 92D6 C7BA diff --git a/data/person/LUTOMA-DN42 b/data/person/LUTOMA-DN42 index ecc22d75f..eee555d76 100644 --- a/data/person/LUTOMA-DN42 +++ b/data/person/LUTOMA-DN42 @@ -3,7 +3,6 @@ e-mail: hello@lutoma.org nick: lutoma www: https://lutoma.org remarks: IRC: lutoma on hackint -pgp-id: F828A0C8C9E1BD2C pgp-fingerprint: B309 6283 6CFD 554A 1EC8 BDBC F828 A0C8 C9E1 BD2C abuse-mailbox: hello+dn42-abuse@lutoma.org nic-hdl: LUTOMA-DN42 diff --git a/data/person/LYREX-DN42 b/data/person/LYREX-DN42 index 99cde040b..15a0e75ed 100644 --- a/data/person/LYREX-DN42 +++ b/data/person/LYREX-DN42 @@ -1,7 +1,6 @@ person: Lyrex nic-hdl: LYREX-DN42 mnt-by: LYREX-MNT -pgp-id: 02845EAC pgp-fingerprint: 6AFD 9C68 023A 8F6A 8FD5 9BBD FB49 FF99 0284 5EAC e-mail: admin@lyrex.net contact: XMPP: lyrex@exploit.im diff --git a/data/person/MARTIN89-DN42 b/data/person/MARTIN89-DN42 index b671f183d..845b86660 100644 --- a/data/person/MARTIN89-DN42 +++ b/data/person/MARTIN89-DN42 @@ -1,6 +1,5 @@ person: Martin89 e-mail: martin89@martin89.de -pgp-id: 1DF9DEBB pgp-fingerprint: 4523 2747 839B 6CA8 F33D DE6B 438A F39A 1DF9 DEBB nic-hdl: MARTIN89-DN42 mnt-by: DUMMY-MNT diff --git a/data/person/MIC92-DN42 b/data/person/MIC92-DN42 index 8e144022a..5c088bbf1 100644 --- a/data/person/MIC92-DN42 +++ b/data/person/MIC92-DN42 @@ -3,7 +3,6 @@ e-mail: joerg@higgsboson.tk contact: xmpp:joerg@higgsboson.tk e-mail: joerg@higgsboson.tk contact: irc:Mic92 -pgp-id: 0xCA4106B8D7CC79FA pgp-fingerprint: 4ABA 0738 2AD5 7E6B 9AA4 E88D CA41 06B8 D7CC 79FA nic-hdl: MIC92-DN42 mnt-by: MIC92-MNT diff --git a/data/person/MIID-DN42 b/data/person/MIID-DN42 index ab7e07526..dd710e18e 100644 --- a/data/person/MIID-DN42 +++ b/data/person/MIID-DN42 @@ -2,6 +2,5 @@ person: damoun e-mail: damien@plenard.me contact: xmpp:damien@plenard.me contact: twitter:dam0un -pgp-id: 0x223D2DB46243F467 nic-hdl: MIID-DN42 mnt-by: MIID-MNT diff --git a/data/person/MIN-DN42 b/data/person/MIN-DN42 index bb9ae1dfa..a6cd119b9 100644 --- a/data/person/MIN-DN42 +++ b/data/person/MIN-DN42 @@ -3,7 +3,6 @@ contact: 292995162 for Wechat/QQ contact: minmemory for Telegram/Line phone: +16465352372 e-mail: min@utbhost.com -pgp-id: A5FDA62C pgp-fingerprint: 556B 13B6 FACF BC26 161D B2AE B270 BEA3 A5FD A62C nic-hdl: MIN-DN42 mnt-by: UTB-MNT diff --git a/data/person/MINKE-DN42 b/data/person/MINKE-DN42 index 6ff99e9a9..81415fb67 100644 --- a/data/person/MINKE-DN42 +++ b/data/person/MINKE-DN42 @@ -1,6 +1,5 @@ person: MINKE contact: noc@minkenetz.de -pgp-id: 0C0D8CDE pgp-fingerprint: 4D77 C9E1 3A9C DD15 64F0 4743 4D20 FAB9 0C0D 8CDE nic-hdl: MINKE-DN42 mnt-by: MINKE-MNT diff --git a/data/person/MINKENSTEIN-DN42 b/data/person/MINKENSTEIN-DN42 index 8b557213f..8a5b135a1 100644 --- a/data/person/MINKENSTEIN-DN42 +++ b/data/person/MINKENSTEIN-DN42 @@ -2,7 +2,6 @@ person: Minkenstein e-mail: r.minke.greifenstein@gmail.com www: http://minkenetz.de www: http://minkenstein.dn42 -pgp-id: 0C0D8CDE pgp-fingerprint: 4D77 C9E1 3A9C DD15 64F0 4743 4D20 FAB9 0C0D 8CDE contact: Telegram: @Minkenstein contact: Teamspeak 3: loaderror.de diff --git a/data/person/MWHEELER-DN42 b/data/person/MWHEELER-DN42 index cf789c149..674e2e971 100644 --- a/data/person/MWHEELER-DN42 +++ b/data/person/MWHEELER-DN42 @@ -2,7 +2,6 @@ person: Michael Wheeler contact: dn24@mwheeler.org nic-hdl: MWHEELER-DN42 mnt-by: MWHEELER-MNT -pgp-id: 275f7bf68750e308 e-mail: dn24@mwheeler.org www: http://mwheeler.org phone: +61439668012 diff --git a/data/person/NAZCO-DN42 b/data/person/NAZCO-DN42 index f042d2013..8db0dc49d 100644 --- a/data/person/NAZCO-DN42 +++ b/data/person/NAZCO-DN42 @@ -2,7 +2,6 @@ person: NAZCO contact: mailto:mail@nazco.de contact: xmpp:ben@0x06.org contact: irc: nazco @ hackint -pgp-id: F24CF82AEB9D7637 pgp-fingerprint: 8A9F F650 FACC E0C3 22D7 C887 F24C F82A EB9D 7637 mnt-by: NAZCO-MNT nic-hdl: NAZCO-DN42 diff --git a/data/person/NICO-DN42 b/data/person/NICO-DN42 index 66bdfd80a..07b36cc98 100644 --- a/data/person/NICO-DN42 +++ b/data/person/NICO-DN42 @@ -1,5 +1,4 @@ person: Nicolas Gilles contact: nicolas.gilles@gmail.com -pgp-id: 0x46B70CD5 nic-hdl: NICO-DN42 mnt-by: DTOMATO-MNT diff --git a/data/person/NV2015-DN42 b/data/person/NV2015-DN42 index 270e6df27..2dcc8ee7e 100644 --- a/data/person/NV2015-DN42 +++ b/data/person/NV2015-DN42 @@ -1,6 +1,5 @@ person: Nikola Vitanovic contact: n.vitanovic@gmail.com -pgp-id: 687CD49B pgp-fingerprint: 3136 6EEF A803 3F4F 1A88 D9A1 9C03 E505 687C D49B contact: irc: VITA nic-hdl: NV2015-DN42 diff --git a/data/person/OBBI-DN42 b/data/person/OBBI-DN42 index ae357d2b4..fa6ab1f72 100644 --- a/data/person/OBBI-DN42 +++ b/data/person/OBBI-DN42 @@ -2,5 +2,4 @@ person: Obbi contact: xmpp:obbi@u5b.de nic-hdl: OBBI-DN42 mnt-by: OBBI-MNT -pgp-id: 0xE49A58151E183330 e-mail: obbi@u5b.de diff --git a/data/person/OLEANDER-DN42 b/data/person/OLEANDER-DN42 index d1e4fcb53..d35de8b49 100644 --- a/data/person/OLEANDER-DN42 +++ b/data/person/OLEANDER-DN42 @@ -2,7 +2,6 @@ person: Oleander Reis e-mail: hostmaster@reis.asia contact: mail:hostmaster@reis.asia contact: xmpp:oleander@oleander.cc -pgp-id: 0x706677DB91C3EFE9 pgp-fingerprint: EFDA D3FF 25C6 A712 C16D 68C5 7066 77DB 91C3 EFE9 nic-hdl: OLEANDER-DN42 mnt-by: DUMMY-MNT diff --git a/data/person/PAULCDB-DN42 b/data/person/PAULCDB-DN42 index 2fc50918d..d83da6791 100644 --- a/data/person/PAULCDB-DN42 +++ b/data/person/PAULCDB-DN42 @@ -3,4 +3,3 @@ contact: paulcdb@gmail.com nic-hdl: PAULCDB-DN42 mnt-by: PAULCDB-MNT pgp-fingerprint: 8002 A8D1 069A AF60 F29C BC27 7534 B998 A629 551A -pgp-id: A629551A diff --git a/data/person/PDOSTAL-DN42 b/data/person/PDOSTAL-DN42 index 58e4937db..734d816cc 100644 --- a/data/person/PDOSTAL-DN42 +++ b/data/person/PDOSTAL-DN42 @@ -3,7 +3,6 @@ contact: dn42@pdostal.cz contact: xmpp:pdostal@jabber.cz contact: irc:pdostal@hackint contact: twitter:pdostal_en -pgp-id: 70974BA9 pgp-fingerprint: CEC9 A9AA B7F6 9CE8 4136 D67A 65BD CDAB 7097 4BA9 nic-hdl: PDOSTAL-DN42 mnt-by: PDOSTAL-MNT diff --git a/data/person/RAIDER-DN42 b/data/person/RAIDER-DN42 index d10390cf0..b90154888 100644 --- a/data/person/RAIDER-DN42 +++ b/data/person/RAIDER-DN42 @@ -2,5 +2,4 @@ person: raider contact: xmpp:raider@jabber.taclan.de, irc:raider@hackint nic-hdl: RAIDER-DN42 mnt-by: LURKAT-MNT -pgp-id: 0x0F772991 pgp-fingerprint: 735D D266 9590 8FAC 14DD ADBA 33F7 1100 0F77 2991 diff --git a/data/person/REDBEARD-DN42 b/data/person/REDBEARD-DN42 index f74f545fc..47987613e 100644 --- a/data/person/REDBEARD-DN42 +++ b/data/person/REDBEARD-DN42 @@ -1,6 +1,5 @@ person: REDBEARD contact: irc:red_beard e-mail: bharrington@alticon.net -pgp-id: 0x933F54083D6DF566 nic-hdl: REDBEARD-DN42 mnt-by: REDBEARD-MNT diff --git a/data/person/RELROD-DN42 b/data/person/RELROD-DN42 index 0314b610e..181f5e145 100644 --- a/data/person/RELROD-DN42 +++ b/data/person/RELROD-DN42 @@ -2,5 +2,4 @@ person: relrod contact: twitter:relrod6, irc:relrod@hackint, irc:relrod@freenode nic-hdl: RELROD-DN42 mnt-by: RELROD-MNT -pgp-id: DAD3DF0E pgp-fingerprint: 9739 5A0F BDC8 1D20 A137 CDCC 0027 10B0 DAD3 DF0E diff --git a/data/person/RIPPERFOX-DN42 b/data/person/RIPPERFOX-DN42 index 66b09cb3a..898847cf1 100644 --- a/data/person/RIPPERFOX-DN42 +++ b/data/person/RIPPERFOX-DN42 @@ -3,5 +3,4 @@ nic-hdl: RIPPERFOX-DN42 mnt-by: RIPPERFOX-MNT e-mail: ripperfox@gmx.de contact: xmpp:ripperfox@sixvpn.net -pgp-id: 0xA5E76C8D pgp-fingerprint: 3476 CF9D 7D73 A724 1B7F B8B2 55FA 26CC A5E7 6C8D diff --git a/data/person/ROELOFN-DN42 b/data/person/ROELOFN-DN42 index 4bc53c513..75b88379f 100644 --- a/data/person/ROELOFN-DN42 +++ b/data/person/ROELOFN-DN42 @@ -1,5 +1,4 @@ person: Roelof Nutbeij contact: roelof.nutbeij@linux.com -pgp-id: 69B24281 nic-hdl: ROELOFN-DN42 mnt-by: ROELOFN-MNT diff --git a/data/person/RYAN-DN42 b/data/person/RYAN-DN42 index 2ddc4e720..3cc001b0e 100644 --- a/data/person/RYAN-DN42 +++ b/data/person/RYAN-DN42 @@ -3,5 +3,4 @@ e-mail: ryan@r1ske.net contact: xmpp:ryan@r1ske.net nic-hdl: RYAN-DN42 mnt-by: RYAN-MNT -pgp-id: F95CDE14 pgp-fingerprint: 0616 3EDF 35DA BF0D 3C67 A2EE 695B 67CF F95C DE14 diff --git a/data/person/SEBI-DN42 b/data/person/SEBI-DN42 index 042d7b7d2..a1eb94642 100644 --- a/data/person/SEBI-DN42 +++ b/data/person/SEBI-DN42 @@ -4,6 +4,5 @@ contact: xmpp:sebi@sebi.org e-mail: sebi@sebi.org abuse-mailbox: abuse@sebi.org www: http://sebi.org/ -pgp-id: 2048R/D6099A77 pgp-fingerprint: 4104 CC78 BE71 FE55 42FD 566F 3791 6A22 D609 9A77 mnt-by: SEBI-MNT diff --git a/data/person/SGNT-DN42 b/data/person/SGNT-DN42 index ad53be66a..cf7970db3 100644 --- a/data/person/SGNT-DN42 +++ b/data/person/SGNT-DN42 @@ -3,4 +3,3 @@ contact: thomas@fragstein.de nic-hdl: SGNT-DN42 mnt-by: SGNT-MNT pgp-fingerprint: EF5A FA3 0 46 8C B DED 7A59 A7B A 29 C7 D 2D5 34D2 0E0 B -pgp-id: 34D20E0B diff --git a/data/person/SHEOGORATH-DN42 b/data/person/SHEOGORATH-DN42 index 0441be713..99a6c13a4 100644 --- a/data/person/SHEOGORATH-DN42 +++ b/data/person/SHEOGORATH-DN42 @@ -2,7 +2,6 @@ person: Sheogorath contact: irc:sheogorath@hackint e-mail: sheogorath@shivering-isles.com org: ORG-MADCIX -pgp-id: 0B628583 pgp-fingerprint: 3DA3 B861 E7AF 8B19 8029 4286 8715 DA9D 0B62 8583 contact: irc:sheogorath@madirc nic-hdl: SHEOGORATH-DN42 diff --git a/data/person/SIDEREAL-DN42 b/data/person/SIDEREAL-DN42 index 21b926150..67a8dc11d 100644 --- a/data/person/SIDEREAL-DN42 +++ b/data/person/SIDEREAL-DN42 @@ -1,6 +1,5 @@ person: stuwil contact: stuart@sidereal.ca nic-hdl: SIDEREAL-DN42 -pgp-id: 16F480F6 pgp-fingerprint: 1D8735BB7570B1D4276BB4D416F480F6 mnt-by: SIDEREAL-MNT diff --git a/data/person/SIGTERM-DN42 b/data/person/SIGTERM-DN42 index 92a3ac22a..49b8882b8 100644 --- a/data/person/SIGTERM-DN42 +++ b/data/person/SIGTERM-DN42 @@ -4,7 +4,7 @@ phone: +4741003522 www: https://sigterm.no pgp-fingerprint: CD37 42E4 20F4 F153 9371 A41F B431 B677 70E4 AA38 e-mail: meeh@sigterm.no -bitcoin: 1MeehoFybzJ41Yv88VMRqXSa2T9TpGfPhR +remarks: bitcoin: 1MeehoFybzJ41Yv88VMRqXSa2T9TpGfPhR address: Oslo. (Peers in Australia, USA, Europa and Russia. But most available from Norway) remarks: irc:Meeh@irc.greyhat.no, twitter:Mikalv nic-hdl: SIGTERM-DN42 diff --git a/data/person/SIN-DN42 b/data/person/SIN-DN42 index ce310bedc..469dc7f06 100644 --- a/data/person/SIN-DN42 +++ b/data/person/SIN-DN42 @@ -1,7 +1,6 @@ person: sin contact: sin@2f30.org contact: irc: sin@hackint -pgp-id: 17B2E84A pgp-fingerprint: 55C5 1DDB 9143 3CD9 06E0 ADCB 053B E4CE 17B2 E84A nic-hdl: SIN-DN42 mnt-by: 2F30-MNT diff --git a/data/person/SISKA-DN42 b/data/person/SISKA-DN42 index fcc1e3ded..03f98977b 100644 --- a/data/person/SISKA-DN42 +++ b/data/person/SISKA-DN42 @@ -1,7 +1,6 @@ person: siska e-mail: siska@nixnodes.net -bitcoin: 1DSe7wUFAa3Cxu1UZHy7Mj6nM4EAsf1J81 -pgp-id: 40E4CD08 +remarks: bitcoin: 1DSe7wUFAa3Cxu1UZHy7Mj6nM4EAsf1J81 pgp-fingerprint: 1983 7B12 8909 C458 0A6F 49DB A0D1 4652 40E4 CD08 nic-hdl: SISKA-DN42 mnt-by: NIXNODES-MNT diff --git a/data/person/STV0G-DN42 b/data/person/STV0G-DN42 index 5478275d3..54ccce560 100644 --- a/data/person/STV0G-DN42 +++ b/data/person/STV0G-DN42 @@ -5,7 +5,6 @@ phone: +4915757180927 www: http://www.steffenvogel.de contact: twitter:stv0g contact: xmpp:steffen.vogel@jabber.rwth-aachen.de -pgp-id: ED659472 pgp-fingerprint: DD60 7D6E 6DE5 0F46 9FAF 4D82 59D5 31B8 ED65 9472 org: ORG-NULLL mnt-by: NULLL-MNT diff --git a/data/person/TATONKA-DN42 b/data/person/TATONKA-DN42 index cc8a4257d..9d083e2a7 100644 --- a/data/person/TATONKA-DN42 +++ b/data/person/TATONKA-DN42 @@ -1,7 +1,6 @@ person: tatonka contact: XMPP: jabber@simonszu.de contact: Twitter: @simonszu -pgp-id: 9EAA1201 pgp-fingerprint: 339E A650 084D D388 07F5 1CF4 88C6 B4D5 9EAA 1201 e-mail: mail@simonszu.de nic-hdl: TATONKA-DN42 diff --git a/data/person/TAZIDEN-DN42 b/data/person/TAZIDEN-DN42 index c70bc541c..084e24658 100644 --- a/data/person/TAZIDEN-DN42 +++ b/data/person/TAZIDEN-DN42 @@ -1,6 +1,5 @@ person: taziden contact: taziden+dn42@flexiden.org -pgp-id: 0xB6277511 pgp-fingerprint: 5E52 C600 2230 CC2B 48CD F96E 495C ED0E B627 7511 contact: xmpp:taziden@zat.im contact: irc:taziden@freenode diff --git a/data/person/TBSPACE-DN42 b/data/person/TBSPACE-DN42 index 2bdeead43..fee41afed 100644 --- a/data/person/TBSPACE-DN42 +++ b/data/person/TBSPACE-DN42 @@ -3,7 +3,6 @@ remarks: Peering via OpenVPN: peering@tbspace.de contact: xmpp: tobi31061@tbspace.de www: https://dn42info.tbspace.de www: http://tbspace.de -pgp-id: 286E147F pgp-fingerprint: 5B57 3F2E D1B8 FD87 EAFB B6EB 26C1 50CE 286E 147F e-mail: t.maedel@alfeld.de nic-hdl: TBSPACE-DN42 diff --git a/data/person/THB-DN42 b/data/person/THB-DN42 index ccc59f64d..33a4cb0cd 100644 --- a/data/person/THB-DN42 +++ b/data/person/THB-DN42 @@ -1,6 +1,5 @@ person: TOBI@HB contact: e-mail:dn42-tobihb@nord-com.net -pgp-id: 0xC2551A0A pgp-fingerprint: B511 9746 FFF3 3331 79A0 5D05 AFC3 915C C255 1A0A nic-hdl: THB-DN42 mnt-by: TOBIHB-MNT diff --git a/data/person/TLV-DN42 b/data/person/TLV-DN42 index b9dfef952..7f4214d9e 100644 --- a/data/person/TLV-DN42 +++ b/data/person/TLV-DN42 @@ -3,5 +3,4 @@ contact: irc:tlv@hackint contact: admin@tlv-dn42.org nic-hdl: TLV-DN42 mnt-by: TLV-MNT -pgp-id: 9B2B291D pgp-fingerprint: BBCD31E795BDFE8B4C5474159E8B584C9B2B291D diff --git a/data/person/TOBEE-DN42 b/data/person/TOBEE-DN42 index 047e1b61c..20e230068 100644 --- a/data/person/TOBEE-DN42 +++ b/data/person/TOBEE-DN42 @@ -1,7 +1,6 @@ person: Tom Spier contact: tom@xcv.vc contact: irc: toBee@hackint -pgp-id: 0x0443F22D pgp-fingerprint: 26A5 3527 9DCD 5F3A 2105 CC1D EDE1 F56F 0443 F22D nic-hdl: TOBEE-DN42 mnt-by: BLAZING-MNT diff --git a/data/person/TOMBII-DN42 b/data/person/TOMBII-DN42 index f3dd97d0c..62dc29d14 100644 --- a/data/person/TOMBII-DN42 +++ b/data/person/TOMBII-DN42 @@ -2,4 +2,3 @@ person: TOMBII-DN42 nic-hdl: TOMBII-DN42 mnt-by: TOMBII-DN42-MNT e-mail: admin@tombii-dn42.com -pgp-id: 0x2C208777 diff --git a/data/person/TRRUNDE-DN42 b/data/person/TRRUNDE-DN42 index 7760cedeb..233f0e404 100644 --- a/data/person/TRRUNDE-DN42 +++ b/data/person/TRRUNDE-DN42 @@ -1,6 +1,5 @@ person: Trond Arne contact: trrunde@trrunde.no -pgp-id: 92991388 pgp-fingerprint: A6FB EC14 FDE9 32A5 669C E18D 8E03 F578 9299 1388 nic-hdl: TRRUNDE-DN42 mnt-by: TRRUNDE-MNT diff --git a/data/person/TRUNET-DN42 b/data/person/TRUNET-DN42 index fbc0dfb7d..1db06423b 100644 --- a/data/person/TRUNET-DN42 +++ b/data/person/TRUNET-DN42 @@ -1,6 +1,5 @@ person: trunet contact: mail:trunet@trunet.dn42 -pgp-id: 2A094EBB pgp-fingerprint: 26D0 1144 D4DC 41B1 5A59 A4D4 5C57 B51B 2A09 4EBB nic-hdl: TRUNET-DN42 mnt-by: TRUNET-MNT diff --git a/data/person/TSYS-DN42 b/data/person/TSYS-DN42 index 773577fa4..128f6300d 100644 --- a/data/person/TSYS-DN42 +++ b/data/person/TSYS-DN42 @@ -1,6 +1,5 @@ person: tsys contact: dn42@t-sys.eu -pgp-id: 73BA1512 pgp-fingerprint: EB00 15CE 5D1D 5954 4A4A AE0F 7087 4EE6 73BA 1512 nic-hdl: TSYS-DN42 mnt-by: TSYS-MNT diff --git a/data/person/TUXFLUX-DN42 b/data/person/TUXFLUX-DN42 index dec9ff993..9d1565cf3 100644 --- a/data/person/TUXFLUX-DN42 +++ b/data/person/TUXFLUX-DN42 @@ -1,7 +1,6 @@ person: Marcel Straub contact: marcel@straub-nv.de contact: xmpp:marcel.straub@jabber.rwth-aachen.de -pgp-id: CF55A902 pgp-fingerprint: 0C10 4655 E550 EA66 E14C 21FD 9EE2 18F7 CF55 A902 nic-hdl: TUXFLUX-DN42 mnt-by: TUXFLUX-MNT diff --git a/data/person/TXTFILE-DN42 b/data/person/TXTFILE-DN42 index 46647ae69..d34e0ce2c 100644 --- a/data/person/TXTFILE-DN42 +++ b/data/person/TXTFILE-DN42 @@ -1,7 +1,6 @@ person: txt.file contact: xmpp:txt.file@txtfile.eu e-mail: txt.file@txtfile.eu -pgp-id: ED8D1E7C pgp-fingerprint: B7A5 B7E5 CB67 024A FD29 145E 3D1E 35F7 ED8D 1E7C nic-hdl: TXTFILE-DN42 mnt-by: TXTFILE-MNT diff --git a/data/person/TYPHON-DN42 b/data/person/TYPHON-DN42 index 79972a26a..0ef9e97c9 100644 --- a/data/person/TYPHON-DN42 +++ b/data/person/TYPHON-DN42 @@ -3,5 +3,4 @@ contact: irc:typhon@hackint e-mail: Typhonnetwork@gmail.com nic-hdl: TYPHON-DN42 pgp-fingerprint: 1FB8 D634 1A20 151E 4490 85C5 CA22 EA6B 3335 653D -pgp-id: 0x3335653D mnt-by: TYPHON-MNT diff --git a/data/person/W-DN42 b/data/person/W-DN42 index 7baa12c12..730dba0df 100644 --- a/data/person/W-DN42 +++ b/data/person/W-DN42 @@ -1,5 +1,5 @@ person: William Weber contact: william@william.si -bitcoin: 14fbJmqV2nrju9wK6awxYFMc2H8vmt5xWK +remarks: bitcoin: 14fbJmqV2nrju9wK6awxYFMc2H8vmt5xWK nic-hdl: W-DN42 mnt-by: W-MNT diff --git a/data/person/W0H-DN42 b/data/person/W0H-DN42 index 63adda6db..0fdd60e01 100644 --- a/data/person/W0H-DN42 +++ b/data/person/W0H-DN42 @@ -3,7 +3,6 @@ nic-hdl: W0H-DN42 mnt-by: W0H-MNT remarks: Peering (OpenVPN, Tinc): dn42@netrik.de e-mail: dn42@netrik.de -pgp-id: D9AF3E27 pgp-fingerprint: D906 119F 9B80 6400 22D0 F690 D99D DFBD D9AF 3E27 abuse-mailbox: dn42@netrik.de contact: irc:w0h@hackint diff --git a/data/person/WEITI-DN42 b/data/person/WEITI-DN42 index 08b6e532d..65347b21f 100644 --- a/data/person/WEITI-DN42 +++ b/data/person/WEITI-DN42 @@ -2,6 +2,5 @@ person: Tim Weippert contact: irc:weiti@hackint e-mail: weiti@weiti.org pgp-fingerprint: E704 7303 6FF0 8393 ADB1 398E 67F2 94AE 5995 7DD8 -pgp-id: 0x59957DD8 nic-hdl: WEITI-DN42 mnt-by: WEITI-MNT diff --git a/data/person/WHS-DN42 b/data/person/WHS-DN42 index 1c993b905..5f2a63f0c 100644 --- a/data/person/WHS-DN42 +++ b/data/person/WHS-DN42 @@ -1,6 +1,5 @@ person: whsinth contact: https://keybase.io/whs -pgp-id: 114F08A7E2081ACA01EC7738461CCB345AD1E4A5 www: https://whs.in.th e-mail: dn42@whs.in.th nic-hdl: WHS-DN42 diff --git a/data/person/WUNIX-DN42 b/data/person/WUNIX-DN42 index 43f1d1b77..53fdb2e06 100644 --- a/data/person/WUNIX-DN42 +++ b/data/person/WUNIX-DN42 @@ -1,7 +1,6 @@ person: wunix contact: xmpp:wunix@jabber.ccc.de e-mail: wunix@berlan.de -pgp-id: A2B22D00 pgp-fingerprint: 0B09 D710 549D F9AD E8D2 5DD6 5104 F557 A2B2 2D00 nic-hdl: WUNIX-DN42 mnt-by: WUNIX-MNT diff --git a/data/person/YANG-DN42 b/data/person/YANG-DN42 index 82568464e..78f55033b 100644 --- a/data/person/YANG-DN42 +++ b/data/person/YANG-DN42 @@ -1,7 +1,6 @@ person: Jan Prunk e-mail: janprunk@gmail.com -pgp-id: 0x00E80E86 pgp-fingerprint: 77C5 156E 29A4 EB6C 1C4A 5EBA 414A 29F5 00E8 0E86 -bitcoin: 17Mp9utV1E7MarPramE3Smv3zMoCxhNpwk +remarks: bitcoin: 17Mp9utV1E7MarPramE3Smv3zMoCxhNpwk mnt-by: YANG-MNT nic-hdl: YANG-DN42 diff --git a/data/person/YEGORG-DN42 b/data/person/YEGORG-DN42 index fbb63aa50..42b246baa 100644 --- a/data/person/YEGORG-DN42 +++ b/data/person/YEGORG-DN42 @@ -2,8 +2,7 @@ person: YEGOR G. contact: mailbox@yegorgavrilov.com contact: irc: yegorg@hackint www: http://www.yegorgavrilov.com -pgp-id: F9B4677A45ED2ED8 pgp-fingerprint: 5E31BCE310BBCADA6A5C3971F9B4677A45ED2ED8 -bitcoin: 1NrpaASeeT9ci7uEeaqXuL2fYg3dAZ78pQ +remarks: bitcoin: 1NrpaASeeT9ci7uEeaqXuL2fYg3dAZ78pQ nic-hdl: YEGORG-DN42 mnt-by: YEGORG-MNT diff --git a/data/person/ZHSJ-DN42 b/data/person/ZHSJ-DN42 index aa1372c6f..d8cbe690b 100644 --- a/data/person/ZHSJ-DN42 +++ b/data/person/ZHSJ-DN42 @@ -1,5 +1,4 @@ person: ZHSJ -pgp-id: 0xCF0E265B7DFBB2F2 e-mail: i@zhsj.me nic-hdl: ZHSJ-DN42 mnt-by: ZHSJ-MNT diff --git a/data/schema/AUT-NUM-SCHEMA b/data/schema/AUT-NUM-SCHEMA index a2ff3418d..658db789b 100644 --- a/data/schema/AUT-NUM-SCHEMA +++ b/data/schema/AUT-NUM-SCHEMA @@ -8,11 +8,11 @@ key: member-of optional multiple lookup=dn42.as-set key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: org optional single lookup=dn42.organisation -key: import optional deprecate multiple -key: export optional deprecate multiple -key: default optional deprecate multiple -key: mp-peer depricate multiple -key: mp-group depricate multiple +key: import deprecate multiple +key: export deprecate multiple +key: default deprecate multiple +key: mp-peer deprecate multiple +key: mp-group deprecate multiple key: mp-import optional multiple key: mp-export optional multiple key: mp-default optional multiple diff --git a/utils/schema-check/dn42-schema.py b/utils/schema-check/dn42-schema.py index b11211ec9..0a6b4bd5e 100755 --- a/utils/schema-check/dn42-schema.py +++ b/utils/schema-check/dn42-schema.py @@ -101,7 +101,7 @@ class SchemaDOM: for k, v, l in f.dom: if k.startswith("x-"): - log.debug("%s Line %d: Key [%s] is user defined." % (f.src, l, k)) + log.info("%s Line %d: Key [%s] is user defined." % (f.src, l, k)) elif k not in self.schema: log.error("%s Line %d: Key [%s] not in schema." % (f.src, l, k))