Merge branch 'master' into zhihuiyuze-20200722/updatedns

修改：     data/mntner/ZHYZ-MNT

.drone.yml

@@ -1,17 +0,0 @@
----
-kind: pipeline
-type: docker
-name: pull-checks
-
-steps:
-- name: squashbot
-  image: dn42/pipeline
-  environment:
-   SQUASHBOT_TOKEN:
-     from_secret: SQUASHBOT_TOKEN
-  commands:
-   - /scripts/squashbot
-
-trigger:
-  event:
-  - pull_request

README.md

@@ -3,14 +3,12 @@ If you are using a different url, please update as soon as possible*
 
 # Guide for creating a Pull Request
 
-1. **Create a local clone of the registry repository**
+1. **Create a local clone of the registry**
 
 ```sh
 git clone git@git.dn42.dev:dn42/registry.git
 ```
 
-*You do not need to fork the registry repository. New users are provisioned as collaborators, allowing everyone permission to create new branches in the main registry repository. Note that this process can take up to 10 minutes after logging in as a new user.*
-
 2. **Create a branch for your changes**
 
 The name of the branch ***must*** follow a specific format:
@@ -31,6 +29,8 @@ git checkout -b foo-20200704/mychange
 git push --set-upstream origin foo-20200704/mychange
 ```
 
+*Note that it can take up to 10 minutes after registering as a new user before you get permission to create the new branch*
+
 3. **Make your changes on your new branch**
 
 See the [getting started](https://dn42.dev/howto/Getting-Started) guide in the [Wiki](https://dn42.dev) for more information.
@@ -50,18 +50,9 @@ git commit
 
 4. **Push your changes back to the registry**
 
-You must squash multiple commits together and sign them using your MNTNER [authentication method](https://dn42.dev/howto/Registry-Authentication).  
+Remember to squash your commits and sign them using your MNTNER [authentication method](https://dn42.dev/howto/Registry-Authentication).  
 It is also good practice to rebase your work on top of any other changes that may have happened on the master branch.
 
-The registry contains a script that will automatically rebase and squash your commits:
-
-```sh
-./squash-my-commits
-git push --force
-```
-
-or you can do it manually:
-
 ```sh
 # make sure your local copy of the master is up to date
 
@@ -97,14 +88,14 @@ Your changes will now go through automatic checking and then manual review by th
 
 6. **Making updates**
 
-If you need to make changes to fix review issues simply make the updates to your branch and follow the process in (4) to rebase, squash and sign your changes again. **You must do this for every update**.
+If you need to change your PR to fix review issues simply make the updates to your branch and follow the process in (4) to rebase, squash and sign your changes again.  
+Please remember to do this for every update. 
 
-Do not close and re-open a new pull request, any changes you make on your branch will be automatically updated in the PR. Creating a new PR loses all the history and makes tracking changes harder.
 
 # Gitea Usage
 
-The DN42 registry is a community resource for *your* benefit.
+The DN42 registry is a community resource for *your* benefit.  
-Registered users are free to create and use their own repositories and use the Drone CI tools, but please be considerate in your usage.
+Whilst registered users are free to create and use their own repositories, please be considerate in your usage.
 
  - Repositories should be related to DN42
  - Do not create tools that make regular, automated, push changes to repositories unless agreed with the registry maintainers

data/as-set/AS-HENTAI

@@ -1,7 +0,0 @@
-as-set:             AS-HENTAI
-descr:              Hentai Network
-members:            AS140913
-members:            AS4242421025
-members:            AS4201270008
-mnt-by:             ICECAT-MNT
-source:             DN42

data/as-set/AS4242422601:AS-TRANSIT

@@ -192,6 +192,8 @@ remarks:            KILOBYTE-MNT
 members:            AS4242421243
 remarks:            LINSERVERS
 members:            AS4242421987
+remarks:            ICECAT
+members:            AS4242421025
 remarks:            ZOTAN
 members:            AS4242422341
 remarks:            MARROPAX
@@ -222,30 +224,4 @@ remarks:            ALANYHQ
 members:            AS4242420916
 remarks:            JERRY
 members:            AS4242423618
-remarks:            VOTRIBE
-members:            AS4242422610
-remarks:            CAESIA
-members:            AS4242421231
-remarks:            MOE
-members:            AS4242422464
-remarks:            BITBAKERS
-members:            AS4242421224
-remarks:            ITUNALI
-members:            AS4242421977
-remarks:            RDBCN
-members:            AS4242422027
-remarks:            SNH
-members:            AS4242420270
-remarks:            ICECAT
-members:            AS4201270008
-remarks:            WHMCR
-members:            AS4242420210
-remarks:            W1KL4S
-members:            AS4242421516
-remarks:            0XCB
-members:            AS4242422203
-remarks:            KEBE
-members:            AS4242423920
-remarks:            THEQ
-members:            AS4242423847
 source:             DN42

data/aut-num/AS134098

@@ -6,4 +6,4 @@ descr:              Licson Internet Service
 remarks:            Sylveon Network (Hong Kong) Limited.
 remarks:            This was created to fix missing object from neonetwork.
 mnt-by:             DN42-MNT
-source:             APNIC
+source:             DN42

data/aut-num/AS140913

@@ -1,14 +0,0 @@
-aut-num:            AS140913
-as-name:            Hentai Network
-descr:              Hentai Network
-remarks:            ----------------------------------------------------------
-mp-import:          afi ipv4.unicast from AS-ANY accept ANY
-mp-export:          afi ipv4.unicast to AS-ANY   announce AS-HENTAI
-mp-import:          afi ipv6.unicast from AS-ANY accept ANY
-mp-export:          afi ipv6.unicast to AS-ANY   announce AS-HENTAI
-remarks:            ----------------------------------------------------------
-admin-c:            ICECAT-DN42
-tech-c:             ICECAT-DN42
-mnt-by:             ICECAT-MNT
-org:                ORG-NEXTMOE
-source:             APNIC

data/aut-num/AS209557

@@ -1,6 +0,0 @@
-aut-num:            AS209557
-as-name:            YI-NETWORK
-admin-c:            YI-DN42
-tech-c:             YI-DN42
-mnt-by:             YI-MNT
-source:             RIPE

data/aut-num/AS213262

@@ -1,21 +0,0 @@
-aut-num:            AS213262
-as-name:            MOE-AS
-admin-c:            MOE-NEONETWORK
-tech-c:             MOE-NEONETWORK
-descr:              Moe Overflow Electric
-remarks:            Moe 42 Laboratory
-org:                ORG-MOE
-remarks:            -------------------------------------------------
-remarks:            ----------- UPSTREAM/PEER/DOWNSTREAM ------------
-remarks:            -------------------------------------------------
-mp-import:          afi ipv4.unicast from AS-ANY accept ANY
-mp-export:          afi ipv4.unicast to AS-ANY announce ANY
-mp-import:          afi ipv6.unicast from AS-ANY accept ANY
-mp-export:          afi ipv6.unicast to AS-ANY announce ANY
-remarks:            -------------------------------------------------
-remarks:            -------------------------------------------------
-remarks:            Peering Policy: Open(DN42, NeoNetwork, Internet)
-remarks:            Check https://as213262.peeringdb.com/ for Peering
-remarks:            -------------------------------------------------
-mnt-by:             MOE42-MNT
-source:             RIPE

data/aut-num/AS4201270018

@@ -1,7 +0,0 @@
-aut-num:            AS4201270018
-as-name:            caxap Network
-admin-c:            CAXAP-NEONETWORK
-tech-c:             CAXAP-NEONETWORK
-remarks:            Imported from neonetwork, do not edit!
-mnt-by:             DN42-MNT
-source:             NEONETWORK

data/aut-num/AS4242420443

@@ -1,6 +0,0 @@
-aut-num:            AS4242420443
-as-name:            PATRYK-AS
-admin-c:            PATRYK-DN42
-tech-c:             PATRYK-DN42
-mnt-by:             PATRYK-MNT
-source:             DN42

data/aut-num/AS4242420506

@@ -1,7 +0,0 @@
-aut-num:            AS4242420506
-as-name:            PUDDING-NET-AS
-descr:              PUDDING Network
-admin-c:            PUDDING-DN42
-tech-c:             PUDDING-DN42
-mnt-by:             PUDDING-MNT
-source:             DN42

data/aut-num/AS4242420507

@@ -1,6 +0,0 @@
-aut-num:            AS4242420507
-as-name:            HONDA Network
-admin-c:            HONDA-DN42
-tech-c:             HONDA-DN42
-mnt-by:             HONDA-MNT
-source:             DN42

data/aut-num/AS4242420514

@@ -1,7 +0,0 @@
-aut-num:            AS4242420514
-as-name:            KOISHI-AS
-descr:              Koishi514
-admin-c:            RVALUE-DN42
-tech-c:             RVALUE-DN42
-mnt-by:             RVALUE-MNT
-source:             DN42

data/aut-num/AS4242420669

@@ -1,13 +0,0 @@
-aut-num:            AS4242420669
-as-name:            AVE-AS
-descr:              Ave on DN42
-remarks:            --------------------------------------------------
-remarks:            Welcome to my DN42 ASN uwu
-remarks:            --------------------------------------------------
-remarks:            As long as things aren't broken I do open peering.
-remarks:            For real internet :tm:, check out AS208590.
-remarks:            --------------------------------------------------
-admin-c:            AVE-DN42
-tech-c:             AVE-DN42
-mnt-by:             AVE-MNT
-source:             DN42

data/aut-num/AS4242420721

@@ -1,7 +0,0 @@
-aut-num:            AS4242420721
-as-name:            SESHI-AS
-descr:              Peer with me at ywtzmc@qq.com | ywtzmc@gmail.com ,just a BGP Player
-admin-c:            SESHI-DN42
-tech-c:             SESHI-DN42
-mnt-by:             SESHI-MNT
-source:             DN42

data/aut-num/AS4242420737

@@ -1,6 +0,0 @@
-aut-num:            AS4242420737
-as-name:            AS for TrueWinter Network
-admin-c:            TRUEWINTER-DN42
-tech-c:             TRUEWINTER-DN42
-mnt-by:             TRUEWINTER-MNT
-source:             DN42

data/aut-num/AS4242420750

@@ -1,6 +0,0 @@
-aut-num:            AS4242420750
-as-name:            TRIHOP
-admin-c:            TRIHOP-DN42
-tech-c:             TRIHOP-DN42
-mnt-by:             TRIHOP-MNT
-source:             DN42

data/aut-num/AS4242420780

@@ -1,6 +0,0 @@
-aut-num:            AS4242420780
-as-name:            AS for uffsalot Network
-admin-c:            UFFSALOT-DN42
-tech-c:             UFFSALOT-DN42
-mnt-by:             UFFSALOT-MNT
-source:             DN42

data/aut-num/AS4242420944

@@ -1,7 +0,0 @@
-aut-num:            AS4242420944
-as-name:            VOXILITY-AS
-descr:              VOXILITY Labs
-admin-c:            VOXILITY-DN42
-tech-c:             VOXILITY-DN42
-mnt-by:             VOXILITY-MNT
-source:             DN42

data/aut-num/AS4242421021

@@ -0,0 +1,7 @@
+aut-num:            AS4242421021
+as-name:            GEEKWU-AS
+descr:              GEEKWU's AS
+admin-c:            GEEKWU-DN42
+tech-c:             GEEKWU-DN42
+mnt-by:             GEEKWU-MNT
+source:             DN42

data/aut-num/AS4242421025

@@ -2,16 +2,12 @@ aut-num:            AS4242421025
 as-name:            NextMoe Neo-Network Intermediate Access Project
 descr:              NextMoe Group Intermediate Access Project
 remarks:            ----------------------------------------------------------
-remarks:            The intermediate access engineering service provided
+remarks:            The intermediate access engineering service provided 
 remarks:            for NeoNetwork is currently in the test period
 remarks:            if you need peer-to-peer interconnection
 remarks:            please look for Telegram@fakeicecat
 remarks:            The ASN is the only upstream of 4201270008
 remarks:            ----------------------------------------------------------
-mp-import:          afi ipv4.unicast from AS-ANY accept ANY
-mp-export:          afi ipv4.unicast to AS-ANY   announce AS-HENTAI
-mp-import:          afi ipv6.unicast from AS-ANY accept ANY
-mp-export:          afi ipv6.unicast to AS-ANY   announce AS-HENTAI
 admin-c:            ICECAT-DN42
 tech-c:             ICECAT-DN42
 mnt-by:             ICECAT-MNT

data/aut-num/AS4242421047

@@ -1,6 +0,0 @@
-aut-num:            AS4242421047
-as-name:            barrow AS
-admin-c:            BARROW-DN42
-tech-c:             BARROW-DN42
-mnt-by:             BARROW-MNT
-source:             DN42

data/aut-num/AS4242421101

@@ -1,7 +0,0 @@
-aut-num:            AS4242421101
-as-name:            SCARLET-AS
-descr:              Peer with me at i@linux.dog
-admin-c:            REMI-DN42
-tech-c:             REMI-DN42
-mnt-by:             REMI-MNT
-source:             DN42

data/aut-num/AS4242421155

@@ -1,6 +0,0 @@
-aut-num:            AS4242421155
-as-name:            AS for L4RS net
-admin-c:            L4RS-DN42
-tech-c:             L4RS-DN42
-mnt-by:             L4RS-MNT
-source:             DN42

data/aut-num/AS4242421165

@@ -1,6 +0,0 @@
-aut-num:            AS4242421165
-as-name:            TRACE-AS
-admin-c:            TRACE-DN42
-tech-c:             TRACE-DN42
-mnt-by:             TRACE-MNT
-source:             DN42

data/aut-num/AS4242421207

@@ -1,7 +0,0 @@
-aut-num:            AS4242421207
-as-name:            SECRETMINE-AS
-descr:              SECRETMINE ASN
-admin-c:            SECRETMINE-DN42
-tech-c:             SECRETMINE-DN42
-mnt-by:             SECRETMINE-MNT
-source:             DN42

data/aut-num/AS4242421267

@@ -1,7 +0,0 @@
-aut-num:            AS4242421267
-as-name:            SIGFRIED-AS
-descr:              Sigfried AS
-admin-c:            SIGFRIED-DN42
-tech-c:             SIGFRIED-DN42
-mnt-by:             SIGFRIED-MNT
-source:             DN42

data/aut-num/AS4242421273

@@ -1,6 +0,0 @@
-aut-num:            AS4242421273
-as-name:            spencercw
-admin-c:            SPENCERCW-DN42
-tech-c:             SPENCERCW-DN42
-mnt-by:             SPENCERCW-MNT
-source:             DN42

data/aut-num/AS4242421457

@@ -1,6 +0,0 @@
-aut-num:            AS4242421457
-as-name:            AS for RAITO network
-admin-c:            RAITO-DN42
-tech-c:             RAITO-DN42
-mnt-by:             RAITO-MNT
-source:             DN42

data/aut-num/AS4242421608

@@ -1,6 +0,0 @@
-aut-num:            AS4242421608
-as-name:            LEAH2-AS
-admin-c:            LEAH2-DN42
-tech-c:             LEAH2-DN42
-mnt-by:             LEAH2-MNT
-source:             DN42

data/aut-num/AS4242421825

@@ -1,6 +0,0 @@
-aut-num:            AS4242421825
-admin-c:            LUKKIE-DN42
-tech-c:             LUKKIE-DN42
-mnt-by:             LUKKIE-MNT
-as-name:            Lukkie' AS
-source:             DN42

data/aut-num/AS4242421873

@@ -0,0 +1,7 @@
+aut-num:            AS4242421873
+as-name:            RMNTN-NET-AS
+org:                ORG-RMNTN
+admin-c:            RACOMAIZER-DN42
+tech-c:             RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+source:             DN42

data/aut-num/AS4242421938

@@ -1,7 +0,0 @@
-aut-num:            AS4242421938
-as-name:            BABBLE-AS
-descr:              Babble AS
-admin-c:            BABBLE-DN42
-tech-c:             BABBLE-DN42
-mnt-by:             BABBLE-MNT
-source:             DN42

data/aut-num/AS4242421975

@@ -1,6 +0,0 @@
-aut-num:            AS4242421975
-as-name:            FL
-admin-c:            FL-DN42
-tech-c:             FL-DN42
-mnt-by:             FL-MNT
-source:             DN42

data/aut-num/AS4242422466

@@ -1,6 +0,0 @@
-aut-num:            AS4242422466
-as-name:            SHYPRE-AS
-admin-c:            SHYPRE-DN42
-tech-c:             SHYPRE-DN42
-mnt-by:             SHYPRE-MNT
-source:             DN42

data/aut-num/AS4242422492

@@ -1,6 +0,0 @@
-aut-num:            AS4242422492
-as-name:            INL Network
-admin-c:            INL-DN42
-tech-c:             INL-DN42
-mnt-by:             INL-MNT
-source:             DN42

data/aut-num/AS4242422575

@@ -6,8 +6,7 @@ descr:              Androw - https://www.androw.eu/
 remarks:            -------------------------------------------------------
 remarks:            Happy to peer with anyone
 remarks:            Wireguard only
-remarks:            IPv4/IPv6
+remarks:            All details available here: https://www.androw.eu/dn42/
-remarks:            All details available here: https://www.androw.eu/net/
 remarks:            -------------------------------------------------------
 mnt-by:             ANDROW-MNT
 source:             DN42

data/aut-num/AS4242422647

@@ -1,7 +0,0 @@
-aut-num:            AS4242422647
-as-name:            AS for pomoke network
-descr:              pomoke's network
-admin-c:            POMOKE-DN42
-tech-c:             POMOKE-DN42
-mnt-by:             POMOKE-MNT
-source:             DN42

data/aut-num/AS4242422705

@@ -1,6 +0,0 @@
-aut-num:            AS4242422705
-as-name:            PIGGY-AS
-admin-c:            PIGGY-DN42
-tech-c:             PIGGY-DN42
-mnt-by:             PIGGY-MNT
-source:             DN42

data/aut-num/AS4242422713

@@ -1,7 +0,0 @@
-aut-num:            AS4242422713
-as-name:            ENP2S0-AS
-descr:              enp2s0 AS
-admin-c:            ENP2S0-DN42
-tech-c:             ENP2S0-DN42
-mnt-by:             ENP2S0-MNT
-source:             DN42

data/aut-num/AS4242423073

@@ -1,6 +0,0 @@
-aut-num:            AS4242423073
-as-name:            PATERNOT-AS
-admin-c:            PATERNOT-DN42
-tech-c:             PATERNOT-DN42
-mnt-by:             PATERNOT-MNT
-source:             DN42

data/aut-num/AS4242423347

@@ -1,6 +0,0 @@
-aut-num:            AS4242423347
-as-name:            TKUHACKLAB-AS
-descr:              Turku HackLab ASN, Finland
-org:                ORG-TKUHACKLAB
-mnt-by:             SM-MNT
-source:             DN42

data/aut-num/AS4242423393

@@ -1,7 +0,0 @@
-aut-num:            AS4242423393
-as-name:            VICTORY-AS
-descr:              Peer with me at 22981096@qq.com
-admin-c:            VICTORY-DN42
-tech-c:             VICTORY-DN42
-mnt-by:             VICTORY-MNT
-source:             DN42

data/aut-num/AS4242423740

@@ -1,6 +0,0 @@
-aut-num:            AS4242423740
-as-name:            AS for ROBOBO Network
-admin-c:            ROBOBO-DN42
-tech-c:             ROBOBO-DN42
-mnt-by:             ROBOBO-MNT
-source:             DN42

data/aut-num/AS4242423761

@@ -1,6 +0,0 @@
-aut-num:            AS4242423761
-as-name:            AS for l3ibi network
-admin-c:            L3IBI-DN42
-tech-c:             L3IBI-DN42
-mnt-by:             L3IBI-MNT
-source:             DN42

data/aut-num/AS4242423850

@@ -1,12 +0,0 @@
-aut-num:            AS4242423850
-as-name:            YZUCRC-AS
-remarks:            --------------------------------------------------------
-remarks:            Welcome to establish peers, server in Taiwan.
-remarks:            Please send email to s1030361@mail.yzu.edu.tw
-remarks:            --------------------------------------------------------
-descr:              Yuan Ze University Communications Research Center Network
-admin-c:            XINYUAN-DN42
-tech-c:             XINYUAN-DN42
-org:                ORG-YZUCRC
-mnt-by:             XINYUAN-MNT
-source:             DN42

data/aut-num/AS4242423859

@@ -1,6 +0,0 @@
-aut-num:            AS4242423859
-admin-c:            SVINSON-DN42
-tech-c:             SVINSON-DN42
-mnt-by:             SVINSON-MNT
-as-name:            SVINSON Networks
-source:             DN42

data/aut-num/AS4242423953

@@ -1,22 +0,0 @@
-aut-num:            AS4242423953
-as-name:            Erinn Network Global Backbone
-remarks:            
-remarks:            -------------------------------------------
-remarks:            Erinn Network              Open for Peering
-remarks:            -------------------------------------------
-remarks:            Service Area : ULADH
-remarks:            Taillteann[CA_YYZ]
-remarks:            -------------------------------------------
-remarks:            Service Area : IRIA
-remarks:            Vales[CN_CGQ]
-remarks:            -------------------------------------------
-remarks:            Telegram Channel              @ErinnNetwork
-remarks:            Looking Glass      lg.2434.me lg.erinn.dn42
-remarks:            Website             https://erinnet.2434.me
-remarks:            -------------------------------------------
-remarks:            
-admin-c:            ERINN-DN42
-tech-c:             ERINN-DN42
-mnt-by:             ERINN-MNT
-org:                ORG-ERINN
-source:             DN42

data/aut-num/AS49752

@@ -0,0 +1,7 @@
+aut-num:            AS49752
+as-name:            REDPANDANETWORK-AS
+descr:              Red Panda Network
+admin-c:            REDP-DN42
+tech-c:             REDP-DN42
+mnt-by:             REDPANDA-MNT
+source:             RIPE

data/aut-num/AS64737

@@ -1,15 +1,17 @@
 aut-num:            AS64737
 as-name:            XUU-AS
-descr:              xuu.dn42 network
+descr:              Xuu.dn42 network
+x-userdef:          User Defined Option.
 remarks:            +---------------------------------------------+
 remarks:            ##    Located in DE, California & Ontario    ##
-remarks:            ##         Currently CLOSED to new Peers     ##
+remarks:            ##         Currently OPEN to new Peers       ##
 remarks:            +---------------------------------------------+
 remarks:            ## Anycast DNS:  172.23.0.53                 ##
 remarks:            ## Anycast DNS6: fd42:d42:d42:53::1          ##
 remarks:            +---------------------------------------------+
+geo-loc:            43.597N  79.615W athapa
 geo-loc:            40.776N 111.920W ayurveda
-geo-loc:            09.000N  51.000E rakta
+geo-loc:            09.000N  51.000E rishi
 geo-loc:            45.504N  73.574W kapha
 geo-loc:            37.296N 122.097W lavana
 admin-c:            SOURIS-DN42

data/aut-num/AS64742

@@ -1,8 +1,8 @@
 aut-num:            AS64742
 as-name:            CHIANTOS-AS
-descr:              Chiantos Network
+descr:              Chiantos Network - Kankan Home Network
-remarks:            Peerings via Wireguard (preferred) or OpenVPN
+remarks:            Peerings via OpenVPN and Tinc
-remarks:            Peering node hosted at Paris (FR)
+remarks:            Peerings nodes hosted at Paris (FR) and Roubaix (FR)
 admin-c:            KANKAN-DN42
 tech-c:             KANKAN-DN42
 mnt-by:             KANKAN-MNT

data/aut-num/AS65025

@@ -0,0 +1,6 @@
+aut-num:            AS65025
+as-name:            ICVPN-BAYREUTH
+remarks:            Imported from icvpn-meta, do not edit!
+remarks:            File: bayreuth
+mnt-by:             DN42-MNT
+source:             ICVPN

data/dns/as1873.dn42

@@ -0,0 +1,9 @@
+domain:             as1873.dn42
+descr:              Remonton Network AS domain
+org:                ORG-RMNTN
+admin-c:            RACOMAIZER-DN42
+tech-c:             RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+nserver:            ns.as1873.dn42 172.22.181.2
+nserver:            ns.as1873.dn42 fdfd:d0b7:5feb:638c:0000:0000:000a:0001
+source:             DN42

data/dns/babble.dn42

@@ -1,9 +0,0 @@
-domain:             babble.dn42
-admin-c:            BABBLE-DN42
-tech-c:             BABBLE-DN42
-mnt-by:             BABBLE-MNT
-nserver:            ns1.babble.dn42 172.20.48.224
-nserver:            ns1.babble.dn42 fd28:4a00:7533:53::1
-nserver:            ns2.babble.dn42 172.20.48.225
-nserver:            ns2.babble.dn42 fd28:4a00:7533:53::2
-source:             DN42

data/dns/chiantos.dn42

@@ -1,7 +1,6 @@
 domain:             chiantos.dn42
 descr:              Chiantos Main Domain
-nserver:            ns0.chiantos.dn42 172.23.147.53
+nserver:            haruhi.chiantos.dn42 172.23.147.225
-nserver:            ns0.chiantos.dn42 fd8e:6470:7a23:1337::53
 admin-c:            KANKAN-DN42
 tech-c:             KANKAN-DN42
 mnt-by:             KANKAN-MNT

data/dns/delegation-servers.dn42

@@ -5,7 +5,7 @@ nserver:            b.delegation-servers.dn42 fd42:4242:2601:ac53::1
 nserver:            b.delegation-servers.dn42 172.20.129.1
 nserver:            k.delegation-servers.dn42 fdcf:8538:9ad5:1111::2
 nserver:            k.delegation-servers.dn42 172.20.14.34
-nserver:            j.delegation-servers.dn42 fd42:5d71:219:1:216:3eff:fe1e:22d6
+nserver:            j.delegation-servers.dn42 fd42:5d71:219:1:a526:d935:281e:22d6
 nserver:            j.delegation-servers.dn42 172.20.1.254
 nserver:            h.delegation-servers.dn42 fda6:2474:15a4::54
 ds-rdata:           64441 10 2 2b19d6fc6a6efa3218c61d84ad95a3c63b6ed988e2ae0bd7c8dcb91fe5ec7fa8

data/dns/erinn.dn42

@@ -1,10 +0,0 @@
-domain:             erinn.dn42
-admin-c:            ERINN-DN42
-tech-c:             ERINN-DN42
-org:                ORG-ERINN
-mnt-by:             ERINN-MNT
-nserver:            uladh.ns.erinn.dn42 172.21.89.129
-nserver:            uladh.ns.erinn.dn42 fdfd:468b:bab6:554c::1
-nserver:            iria.ns.erinn.dn42 172.21.89.131
-nserver:            iria.ns.erinn.dn42 fdfd:468b:bab6:4952::2
-source:             DN42

data/dns/hacklab-fi.dn42

@@ -1,5 +0,0 @@
-domain:             hacklab-fi.dn42
-nserver:            ns1.sm.dn42
-nserver:            ns2.sm.dn42
-mnt-by:             SM-MNT
-source:             DN42

data/dns/l4rs.dn42

@@ -1,9 +0,0 @@
-domain:             l4rs.dn42
-admin-c:            L4RS-DN42
-tech-c:             L4RS-DN42
-mnt-by:             L4RS-MNT
-nserver:            ns1.l4rs.dn42 172.20.160.61
-nserver:            ns1.l4rs.dn42 fd6e:cab2:576b:53::1
-nserver:            ns2.l4rs.dn42 172.20.160.62
-nserver:            ns2.l4rs.dn42 fd6e:cab2:576b:53::2
-source:             DN42

data/dns/mpls.dn42

@@ -1,7 +0,0 @@
-domain:             mpls.dn42
-descr:              mpls
-admin-c:            MC36-DN42
-tech-c:             MC36-DN42
-mnt-by:             NOP-MNT
-nserver:            ns.nop.dn42
-source:             DN42

data/dns/patryk.dn42

@@ -1,7 +0,0 @@
-domain:             patryk.dn42
-admin-c:            PATRYK-DN42
-tech-c:             PATRYK-DN42
-mnt-by:             PATRYK-MNT
-nserver:            ns1.patryk.dn42 172.23.24.1
-nserver:            ns1.patryk.dn42 fd42:4242:443::1
-source:             DN42

data/dns/pomoke.dn42

@@ -1,8 +0,0 @@
-domain:             pomoke.dn42
-admin-c:            POMOKE-DN42
-tech-c:             POMOKE-DN42
-mnt-by:             POMOKE-MNT
-descr:              by pomoke Network
-nserver:            ns-a.pomoke.dn42 172.22.137.47
-nserver:            ns-a.pomoke.dn42 fd98:de34:62e8::1
-source:             DN42

data/dns/porn.dn42

@@ -1,8 +0,0 @@
-domain:             porn.dn42
-admin-c:            XINYUAN-DN42
-tech-c:             XINYUAN-DN42
-mnt-by:             XINYUAN-MNT
-org:                ORG-YZUCRC
-nserver:            ns.porn.dn42 172.20.198.1
-nserver:            ns.porn.dn42 fd19:d101:719a:a::1
-source:             DN42

data/dns/raito.dn42

@@ -1,7 +0,0 @@
-domain:             raito.dn42
-admin-c:            RAITO-DN42
-tech-c:             RAITO-DN42
-mnt-by:             RAITO-MNT
-nserver:            ns1.raito.dn42 fd4d:ce73:68f9:9a60::1
-nserver:            ns2.raito.dn42 fd4d:ce73:68f9:9a60::2
-source:             DN42

data/dns/sigfried.dn42

@@ -1,7 +0,0 @@
-domain:             sigfried.dn42
-descr:              Sigfried
-admin-c:            SIGFRIED-DN42
-tech-c:             SIGFRIED-DN42
-mnt-by:             SIGFRIED-MNT
-nserver:            ns1.sigfried.dn42 fd73:6967:6672::53
-source:             DN42

data/dns/sm.dn42

@@ -4,6 +4,4 @@ tech-c:             SM-DN42
 mnt-by:             SM-MNT
 nserver:            ns1.sm.dn42 172.22.114.99
 nserver:            ns1.sm.dn42 fdaa:d0e:147f:1a00::10
-nserver:            ns2.sm.dn42 172.22.114.100
-nserver:            ns2.sm.dn42 fdaa:d0e:147f:2a00::10
 source:             DN42

data/dns/souris.dn42

@@ -1,9 +1,7 @@
 domain:             souris.dn42
 descr:              Souris Darknet Services
-nserver:            lavana.sjc.xuu.dn42
-nserver:            kapha.mtr.xuu.dn42
-nserver:            rakta.fra.xuu.dn42
 admin-c:            SOURIS-DN42
 tech-c:             SOURIS-DN42
 mnt-by:             XUU-MNT
+nserver:            kapha.mtr.xuu.dn42
 source:             DN42

data/dns/svinson.dn42

@@ -1,9 +0,0 @@
-domain:             svinson.dn42
-admin-c:            SVINSON-DN42
-tech-c:             SVINSON-DN42
-mnt-by:             SVINSON-MNT
-nserver:            dns1.svinson.dn42 172.20.231.34
-nserver:            dns1.svinson.dn42 fd71:cfc3:9259:6935::34
-nserver:            dns2.svinson.dn42 172.20.231.35
-nserver:            dns2.svinson.dn42 fd71:cfc3:9259:6935::35
-source:             DN42

data/dns/truewinter.dn42

@@ -1,9 +0,0 @@
-domain:             truewinter.dn42
-admin-c:            TRUEWINTER-DN42
-tech-c:             TRUEWINTER-DN42
-mnt-by:             TRUEWINTER-MNT
-nserver:            ns1.truewinter.dn42 172.20.207.196
-nserver:            ns1.truewinter.dn42 fd49:5b5:b737::53
-nserver:            ns2.truewinter.dn42 172.20.207.197
-nserver:            ns2.truewinter.dn42 fd49:5b5:b737::54
-source:             DN42

data/dns/tyrasuki.dn42

@@ -0,0 +1,9 @@
+domain:             tyrasuki.dn42
+admin-c:            REDP-DN42
+tech-c:             REDP-DN42
+nserver:            ns1.tyrasuki.dn42 172.22.177.31
+nserver:            ns1.tyrasuki.dn42 fd02:685f:edac:ffff::
+nserver:            ns2.tyrasuki.dn42 172.22.177.30
+nserver:            ns2.tyrasuki.dn42 fd02:685f:edac:eeee::
+mnt-by:             REDPANDA-MNT
+source:             DN42

data/dns/uffsalot.dn42

@@ -1,7 +0,0 @@
-domain:             uffsalot.dn42
-admin-c:            UFFSALOT-DN42
-tech-c:             UFFSALOT-DN42
-mnt-by:             UFFSALOT-MNT
-nserver:            ns1.dn42.brand-web.net
-nserver:            ns2.dn42.brand-web.net
-source:             DN42

data/dns/voxility.dn42

@@ -1,7 +0,0 @@
-domain:             voxility.dn42
-descr:              VOXILITY LABS
-admin-c:            VOXILITY-DN42
-tech-c:             VOXILITY-DN42
-mnt-by:             VOXILITY-MNT
-nserver:            ns1.gatuno.dn42
-source:             DN42

data/dns/yi.dn42

@@ -1,6 +1,5 @@
 domain:             yi.dn42
 nserver:            dns1.yi.dn42 172.22.189.96
-nserver:            dns1.yi.dn42 fd69:9889:9692:1::
 admin-c:            YI-DN42
 tech-c:             YI-DN42
 mnt-by:             YI-MNT

data/dns/zhyz.dn42

@@ -1,9 +1,9 @@
 domain:             zhyz.dn42
 descr:              https://zhyz.ru email:zhihuiyuze@gmail.com
 nserver:            ns1.zhyz.dn42 172.21.75.65
-nserver:            ns1.zhyz.dn42 d37:03b3:cae6::65
+nserver:            ns1.zhyz.dn42 fd37:03b3:cae6::65
 nserver:            ns2.zhyz.dn42 172.21.75.66
-nserver:            ns2.zhyz.dn42 d37:03b3:cae6::66
+nserver:            ns2.zhyz.dn42 fd37:03b3:cae6::66
 admin-c:            ZHYZ-DN42
 tech-c:             ZHYZ-DN42
 mnt-by:             ZHYZ-MNT

data/inet6num/fd02:685f:edac::_48

@@ -0,0 +1,13 @@
+inet6num:           fd02:685f:edac:0000:0000:0000:0000:0000 - fd02:685f:edac:ffff:ffff:ffff:ffff:ffff
+cidr:               fd02:685f:edac::/48
+netname:            REDPANDANETWORK-V6
+org:                ORG-REDPANDANETWORK
+descr:              Red Panda Network - IPv6 assignment
+country:            EU
+admin-c:            REDP-DN42
+tech-c:             REDP-DN42
+status:             ASSIGNED
+nserver:            ns1.tyrasuki.dn42
+nserver:            ns2.tyrasuki.dn42
+mnt-by:             REDPANDA-MNT
+source:             DN42

data/inet6num/fd0a:cdb3:cde7::_48

@@ -1,8 +0,0 @@
-inet6num:           fd0a:cdb3:cde7:0000:0000:0000:0000:0000 - fd0a:cdb3:cde7:ffff:ffff:ffff:ffff:ffff
-cidr:               fd0a:cdb3:cde7::/48
-netname:            PIGGY-NETWORK
-admin-c:            PIGGY-DN42
-tech-c:             PIGGY-DN42
-mnt-by:             PIGGY-MNT
-status:             ASSIGNED
-source:             DN42

data/inet6num/fd0b:10c0:9966::_48

@@ -1,8 +0,0 @@
-inet6num:           fd0b:10c0:9966:0000:0000:0000:0000:0000 - fd0b:10c0:9966:ffff:ffff:ffff:ffff:ffff
-cidr:               fd0b:10c0:9966::/48
-netname:            HONDA NET
-admin-c:            HONDA-DN42
-tech-c:             HONDA-DN42
-mnt-by:             HONDA-MNT
-status:             ASSIGNED
-source:             DN42

data/inet6num/fd10:127:6324::_48

@@ -1,8 +0,0 @@
-inet6num:           fd10:0127:6324:0000:0000:0000:0000:0000 - fd10:0127:6324:ffff:ffff:ffff:ffff:ffff
-cidr:               fd10:127:6324::/48
-netname:            caxap6
-admin-c:            CAXAP-NEONETWORK
-tech-c:             CAXAP-NEONETWORK
-remarks:            Imported from neonetwork, do not edit!
-mnt-by:             DN42-MNT
-source:             NEONETWORK

data/inet6num/fd10:127:7:2000::_54

@@ -1,8 +0,0 @@
-inet6num:           fd10:0127:0007:2000:0000:0000:0000:0000 - fd10:0127:0007:23ff:ffff:ffff:ffff:ffff
-cidr:               fd10:127:7:2000::/54
-netname:            StaphReserve_0
-admin-c:            STAPH-NEONETWORK
-tech-c:             STAPH-NEONETWORK
-remarks:            Imported from neonetwork, do not edit!
-mnt-by:             DN42-MNT
-source:             NEONETWORK

data/inet6num/fd10:127:7:2672::_64

@@ -1,8 +0,0 @@
-inet6num:           fd10:0127:0007:2672:0000:0000:0000:0000 - fd10:0127:0007:2672:ffff:ffff:ffff:ffff
-cidr:               fd10:127:7:2672::/64
-netname:            AOSCNet_v6
-admin-c:            STAPH-NEONETWORK
-tech-c:             STAPH-NEONETWORK
-remarks:            Imported from neonetwork, do not edit!
-mnt-by:             DN42-MNT
-source:             NEONETWORK

data/inet6num/fd10:127:7:3000::_52

@@ -1,8 +0,0 @@
-inet6num:           fd10:0127:0007:3000:0000:0000:0000:0000 - fd10:0127:0007:3fff:ffff:ffff:ffff:ffff
-cidr:               fd10:127:7:3000::/52
-netname:            StaphReserve_1
-admin-c:            STAPH-NEONETWORK
-tech-c:             STAPH-NEONETWORK
-remarks:            Imported from neonetwork, do not edit!
-mnt-by:             DN42-MNT
-source:             NEONETWORK

data/inet6num/fd10:127:7:4000::_50

@@ -1,8 +0,0 @@
-inet6num:           fd10:0127:0007:4000:0000:0000:0000:0000 - fd10:0127:0007:7fff:ffff:ffff:ffff:ffff
-cidr:               fd10:127:7:4000::/50
-netname:            StaphReserve_2
-admin-c:            STAPH-NEONETWORK
-tech-c:             STAPH-NEONETWORK
-remarks:            Imported from neonetwork, do not edit!
-mnt-by:             DN42-MNT
-source:             NEONETWORK

data/inet6num/fd10:127:7:8000::_50

@@ -1,8 +0,0 @@
-inet6num:           fd10:0127:0007:8000:0000:0000:0000:0000 - fd10:0127:0007:bfff:ffff:ffff:ffff:ffff
-cidr:               fd10:127:7:8000::/50
-netname:            StaphReserve_3
-admin-c:            STAPH-NEONETWORK
-tech-c:             STAPH-NEONETWORK
-remarks:            Imported from neonetwork, do not edit!
-mnt-by:             DN42-MNT
-source:             NEONETWORK

data/inet6num/fd10:127:7::_48

@@ -1,5 +1,5 @@
-inet6num:           fd10:0127:0007:0000:0000:0000:0000:0000 - fd10:0127:0007:1fff:ffff:ffff:ffff:ffff
+inet6num:           fd10:0127:0007:0000:0000:0000:0000:0000 - fd10:0127:0007:ffff:ffff:ffff:ffff:ffff
-cidr:               fd10:127:7::/51
+cidr:               fd10:127:7::/48
 netname:            Staph_v6
 admin-c:            STAPH-NEONETWORK
 tech-c:             STAPH-NEONETWORK

data/inet6num/fd10:127:7:c000::_51

@@ -1,8 +0,0 @@
-inet6num:           fd10:0127:0007:c000:0000:0000:0000:0000 - fd10:0127:0007:dfff:ffff:ffff:ffff:ffff
-cidr:               fd10:127:7:c000::/51
-netname:            StaphReserve_4
-admin-c:            STAPH-NEONETWORK
-tech-c:             STAPH-NEONETWORK
-remarks:            Imported from neonetwork, do not edit!
-mnt-by:             DN42-MNT
-source:             NEONETWORK

data/inet6num/fd10:127:7:ffff::_64

@@ -1,8 +0,0 @@
-inet6num:           fd10:0127:0007:ffff:0000:0000:0000:0000 - fd10:0127:0007:ffff:ffff:ffff:ffff:ffff
-cidr:               fd10:127:7:ffff::/64
-netname:            StaphPeer
-admin-c:            STAPH-NEONETWORK
-tech-c:             STAPH-NEONETWORK
-remarks:            Imported from neonetwork, do not edit!
-mnt-by:             DN42-MNT
-source:             NEONETWORK

data/inet6num/fd15:1825:72::_48

@@ -1,10 +0,0 @@
-inet6num:           fd15:1825:0072:0000:0000:0000:0000:0000 - fd15:1825:0072:ffff:ffff:ffff:ffff:ffff
-netname:            LUKKIE-NETWORK
-descr:              Lukkie' network
-country:            NL
-admin-c:            LUKKIE-DN42
-tech-c:             LUKKIE-DN42
-mnt-by:             LUKKIE-MNT
-status:             ASSIGNED
-cidr:               fd15:1825:72::/48
-source:             DN42

data/inet6num/fd19:d101:719a::_48

@@ -1,12 +0,0 @@
-inet6num:           fd19:d101:719a:0000:0000:0000:0000:0000 - fd19:d101:719a:ffff:ffff:ffff:ffff:ffff
-cidr:               fd19:d101:719a::/48
-netname:            YZUCRC-NET
-descr:              Yuan Ze University Communications Research Center Network
-remarks:            Peer with me at s1030361@mail.yzu.edu.tw
-country:            TW
-admin-c:            XINYUAN-DN42
-tech-c:             XINYUAN-DN42
-org:                ORG-YZUCRC
-mnt-by:             XINYUAN-MNT
-status:             ASSIGNED
-source:             DN42

data/inet6num/fd22:ad17:8e8d::_48

@@ -1,9 +0,0 @@
-inet6num:           fd22:ad17:8e8d:0000:0000:0000:0000:0000 - fd22:ad17:8e8d:ffff:ffff:ffff:ffff:ffff
-netname:            SHIVA-NETWORK
-country:            BR
-admin-c:            PATERNOT-DN42
-tech-c:             PATERNOT-DN42
-mnt-by:             PATERNOT-MNT
-status:             ASSIGNED
-cidr:               fd22:ad17:8e8d::/48
-source:             DN42

data/inet6num/fd28:4a00:7533::_48

@@ -1,10 +0,0 @@
-inet6num:           fd28:4a00:7533:0000:0000:0000:0000:0000 - fd28:4a00:7533:ffff:ffff:ffff:ffff:ffff
-cidr:               fd28:4a00:7533::/48
-netname:            BABBLE-V6-NET-1
-descr:              Babble Network
-country:            GB
-admin-c:            BABBLE-DN42
-tech-c:             BABBLE-DN42
-mnt-by:             BABBLE-MNT
-status:             ASSIGNED
-source:             DN42

data/inet6num/fd34:afbb:3200::_48

@@ -1,10 +0,0 @@
-inet6num:           fd34:afbb:3200:0000:0000:0000:0000:0000 - fd34:afbb:3200:ffff:ffff:ffff:ffff:ffff
-cidr:               fd34:afbb:3200::/48
-netname:            SECRETMINE-NETWORK
-descr:              Network of SECRETMINE
-country:            DE
-admin-c:            SECRETMINE-DN42
-tech-c:             SECRETMINE-DN42
-mnt-by:             SECRETMINE-MNT
-status:             ASSIGNED
-source:             DN42

data/inet6num/fd39:e07d:e463::_48

@@ -1,9 +0,0 @@
-inet6num:           fd39:e07d:e463:0000:0000:0000:0000:0000 - fd39:e07d:e463:ffff:ffff:ffff:ffff:ffff
-cidr:               fd39:e07d:e463::/48
-netname:            TRACE-NETWORK
-country:            TW
-admin-c:            TRACE-DN42
-tech-c:             TRACE-DN42
-mnt-by:             TRACE-MNT
-status:             ASSIGNED
-source:             DN42

data/inet6num/fd3b:6bc4:49ef::_48

@@ -1,11 +0,0 @@
-inet6num:           fd3b:6bc4:49ef:0000:0000:0000:0000:0000 - fd3b:6bc4:49ef:ffff:ffff:ffff:ffff:ffff
-netname:            SCARLET-KOUMAKAN-NETWORK-IPV6
-descr:              RemiIO's Koumakan Network.
-remarks:            Peer me at i@linux.dog
-country:            CN
-admin-c:            REMI-DN42
-tech-c:             REMI-DN42
-mnt-by:             REMI-MNT
-status:             ASSIGNED
-cidr:               fd3b:6bc4:49ef::/48
-source:             DN42

data/inet6num/fd3e:d065:66fd::_48

@@ -1,10 +0,0 @@
-inet6num:           fd3e:d065:66fd:0000:0000:0000:0000:0000 - fd3e:d065:66fd:ffff:ffff:ffff:ffff:ffff
-netname:            SESHI-IPV6
-descr:              Peer with me at ywtzmc@qq.com | ywtzmc@gmail.com
-country:            CN
-admin-c:            SESHI-DN42
-tech-c:             SESHI-DN42
-mnt-by:             SESHI-MNT
-status:             ASSIGNED
-cidr:               fd3e:d065:66fd::/48
-source:             DN42

data/inet6num/fd40:2200:1975::_48

@@ -1,10 +0,0 @@
-inet6num:           fd40:2200:1975:0000:0000:0000:0000:0000 - fd40:2200:1975:ffff:ffff:ffff:ffff:ffff
-netname:            FL-NET6
-descr:              fl
-country:            FR
-admin-c:            FL-DN42
-tech-c:             FL-DN42
-mnt-by:             FL-MNT
-status:             ASSIGNED
-cidr:               fd40:2200:1975::/48
-source:             DN42

data/inet6num/fd42:180:3de0:100::_60

@@ -1,11 +0,0 @@
-inet6num:           fd42:0180:3de0:0100:0000:0000:0000:0000 - fd42:0180:3de0:010f:ffff:ffff:ffff:ffff
-netname:            NET-REGISTRY6-DN42
-descr:              DN42 Registry Services
-mnt-by:             JRB0001-MNT
-mnt-by:             XUU-MNT
-mnt-by:             BURBLE-MNT
-nserver:            ns1.burble.dn42
-ds-rdata:           12105 13 2 62835302ba66838d4cca7a0079d2ba06f91c01a20d691552cff2db9a54550489
-status:             ASSIGNED PI
-cidr:               fd42:180:3de0:100::/60
-source:             DN42

data/inet6num/fd42:180:3de0:30::_60

@@ -3,8 +3,6 @@ netname:            b.master.delegation-servers.dn42
 mnt-by:             JRB0001-MNT
 mnt-by:             YAMAKAJA-MNT
 mnt-by:             BURBLE-MNT
-nserver:            ns1.burble.dn42
-ds-rdata:           4221 13 2 5eb62ccad2ab81167bd0ddbab14c8fdf01a85eb205faa127e0333876a95b498f
 status:             ASSIGNED PI
 cidr:               fd42:180:3de0:30::/60
 source:             DN42

data/inet6num/fd42:180:3de0::_48

@@ -1,7 +1,7 @@
 inet6num:           fd42:0180:3de0:0000:0000:0000:0000:0000 - fd42:0180:3de0:ffff:ffff:ffff:ffff:ffff
-netname:            NET-CORESVCS6-DN42
+netname:            master.delegation-servers.dn42
-descr:              DN42 Core Services IPv6 Block
+mnt-by:             JRB0001-MNT
-mnt-by:             DN42-MNT
+mnt-by:             YAMAKAJA-MNT
 status:             ALLOCATED PI
 cidr:               fd42:180:3de0::/48
 source:             DN42

data/inet6num/fd42:180:3de0::_56

@@ -1,7 +0,0 @@
-inet6num:           fd42:0180:3de0:0000:0000:0000:0000:0000 - fd42:0180:3de0:00ff:ffff:ffff:ffff:ffff
-netname:            NET-DNSMASTERS6-DN42
-descr:              DN42 DNS Masters
-mnt-by:             DN42-MNT
-status:             ALLOCATED PI
-cidr:               fd42:180:3de0::/56
-source:             DN42

data/inet6num/fd42:4242:443::_48

@@ -1,10 +0,0 @@
-inet6num:           fd42:4242:0443:0000:0000:0000:0000:0000 - fd42:4242:0443:ffff:ffff:ffff:ffff:ffff
-cidr:               fd42:4242:443::/48
-netname:            PATRYK-NETWORK
-country:            GB
-admin-c:            PATRYK-DN42
-tech-c:             PATRYK-DN42
-mnt-by:             PATRYK-MNT
-status:             ASSIGNED
-nserver:            ns1.patryk.dn42
-source:             DN42