diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 000000000..e5f993d5f --- /dev/null +++ b/.drone.yml @@ -0,0 +1,17 @@ +--- +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 diff --git a/README.md b/README.md index 77aa32306..7a313216f 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,14 @@ 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** +1. **Create a local clone of the registry repository** ```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: @@ -29,8 +31,6 @@ 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,9 +50,18 @@ git commit 4. **Push your changes back to the registry** -Remember to squash your commits and sign them using your MNTNER [authentication method](https://dn42.dev/howto/Registry-Authentication). +You must squash multiple commits together 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 @@ -88,14 +97,14 @@ Your changes will now go through automatic checking and then manual review by th 6. **Making updates** -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. +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**. +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. -Whilst registered users are free to create and use their own repositories, please be considerate in your usage. +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. - Repositories should be related to DN42 - Do not create tools that make regular, automated, push changes to repositories unless agreed with the registry maintainers diff --git a/data/aut-num/AS209557 b/data/aut-num/AS209557 new file mode 100644 index 000000000..6b5f3cd83 --- /dev/null +++ b/data/aut-num/AS209557 @@ -0,0 +1,6 @@ +aut-num: AS209557 +as-name: YI-NETWORK +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +source: RIPE diff --git a/data/aut-num/AS4242420507 b/data/aut-num/AS4242420507 new file mode 100644 index 000000000..5ee0acd60 --- /dev/null +++ b/data/aut-num/AS4242420507 @@ -0,0 +1,6 @@ +aut-num: AS4242420507 +as-name: HONDA Network +admin-c: HONDA-DN42 +tech-c: HONDA-DN42 +mnt-by: HONDA-MNT +source: DN42 \ No newline at end of file diff --git a/data/aut-num/AS4242420514 b/data/aut-num/AS4242420514 new file mode 100644 index 000000000..9aabb460d --- /dev/null +++ b/data/aut-num/AS4242420514 @@ -0,0 +1,7 @@ +aut-num: AS4242420514 +as-name: KOISHI-AS +descr: Koishi514 +admin-c: RVALUE-DN42 +tech-c: RVALUE-DN42 +mnt-by: RVALUE-MNT +source: DN42 diff --git a/data/aut-num/AS4242420669 b/data/aut-num/AS4242420669 new file mode 100644 index 000000000..f30bcfddc --- /dev/null +++ b/data/aut-num/AS4242420669 @@ -0,0 +1,13 @@ +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 diff --git a/data/aut-num/AS4242420737 b/data/aut-num/AS4242420737 new file mode 100644 index 000000000..543fe4648 --- /dev/null +++ b/data/aut-num/AS4242420737 @@ -0,0 +1,6 @@ +aut-num: AS4242420737 +as-name: AS for TrueWinter Network +admin-c: TRUEWINTER-DN42 +tech-c: TRUEWINTER-DN42 +mnt-by: TRUEWINTER-MNT +source: DN42 diff --git a/data/aut-num/AS4242421155 b/data/aut-num/AS4242421155 new file mode 100644 index 000000000..d855120de --- /dev/null +++ b/data/aut-num/AS4242421155 @@ -0,0 +1,6 @@ +aut-num: AS4242421155 +as-name: AS for L4RS net +admin-c: L4RS-DN42 +tech-c: L4RS-DN42 +mnt-by: L4RS-MNT +source: DN42 diff --git a/data/aut-num/AS4242421165 b/data/aut-num/AS4242421165 new file mode 100644 index 000000000..5432caf96 --- /dev/null +++ b/data/aut-num/AS4242421165 @@ -0,0 +1,6 @@ +aut-num: AS4242421165 +as-name: TRACE-AS +admin-c: TRACE-DN42 +tech-c: TRACE-DN42 +mnt-by: TRACE-MNT +source: DN42 diff --git a/data/aut-num/AS4242421273 b/data/aut-num/AS4242421273 new file mode 100644 index 000000000..4eb19aed6 --- /dev/null +++ b/data/aut-num/AS4242421273 @@ -0,0 +1,6 @@ +aut-num: AS4242421273 +as-name: spencercw +admin-c: SPENCERCW-DN42 +tech-c: SPENCERCW-DN42 +mnt-by: SPENCERCW-MNT +source: DN42 diff --git a/data/aut-num/AS4242421457 b/data/aut-num/AS4242421457 new file mode 100644 index 000000000..8f400c98a --- /dev/null +++ b/data/aut-num/AS4242421457 @@ -0,0 +1,6 @@ +aut-num: AS4242421457 +as-name: AS for RAITO network +admin-c: RAITO-DN42 +tech-c: RAITO-DN42 +mnt-by: RAITO-MNT +source: DN42 diff --git a/data/aut-num/AS4242421608 b/data/aut-num/AS4242421608 new file mode 100644 index 000000000..2a897a153 --- /dev/null +++ b/data/aut-num/AS4242421608 @@ -0,0 +1,6 @@ +aut-num: AS4242421608 +as-name: LEAH2-AS +admin-c: LEAH2-DN42 +tech-c: LEAH2-DN42 +mnt-by: LEAH2-MNT +source: DN42 diff --git a/data/aut-num/AS4242421975 b/data/aut-num/AS4242421975 new file mode 100644 index 000000000..dfa50a8b7 --- /dev/null +++ b/data/aut-num/AS4242421975 @@ -0,0 +1,6 @@ +aut-num: AS4242421975 +as-name: FL +admin-c: FL-DN42 +tech-c: FL-DN42 +mnt-by: FL-MNT +source: DN42 diff --git a/data/aut-num/AS4242422466 b/data/aut-num/AS4242422466 new file mode 100644 index 000000000..ce667d639 --- /dev/null +++ b/data/aut-num/AS4242422466 @@ -0,0 +1,6 @@ +aut-num: AS4242422466 +as-name: SHYPRE-AS +admin-c: SHYPRE-DN42 +tech-c: SHYPRE-DN42 +mnt-by: SHYPRE-MNT +source: DN42 diff --git a/data/aut-num/AS4242422492 b/data/aut-num/AS4242422492 new file mode 100644 index 000000000..5e793a419 --- /dev/null +++ b/data/aut-num/AS4242422492 @@ -0,0 +1,6 @@ +aut-num: AS4242422492 +as-name: INL Network +admin-c: INL-DN42 +tech-c: INL-DN42 +mnt-by: INL-MNT +source: DN42 diff --git a/data/aut-num/AS4242422575 b/data/aut-num/AS4242422575 index 1c15257d6..37ea53b55 100644 --- a/data/aut-num/AS4242422575 +++ b/data/aut-num/AS4242422575 @@ -6,7 +6,8 @@ descr: Androw - https://www.androw.eu/ remarks: ------------------------------------------------------- remarks: Happy to peer with anyone remarks: Wireguard only -remarks: All details available here: https://www.androw.eu/dn42/ +remarks: IPv4/IPv6 +remarks: All details available here: https://www.androw.eu/net/ remarks: ------------------------------------------------------- mnt-by: ANDROW-MNT source: DN42 diff --git a/data/aut-num/AS424242236 b/data/aut-num/AS4242422647 similarity index 85% rename from data/aut-num/AS424242236 rename to data/aut-num/AS4242422647 index 194c21e97..a3c240bde 100644 --- a/data/aut-num/AS424242236 +++ b/data/aut-num/AS4242422647 @@ -1,4 +1,4 @@ -aut-num: AS424242236 +aut-num: AS4242422647 as-name: AS for pomoke network descr: pomoke's network admin-c: POMOKE-DN42 diff --git a/data/aut-num/AS4242422705 b/data/aut-num/AS4242422705 new file mode 100644 index 000000000..7aac04880 --- /dev/null +++ b/data/aut-num/AS4242422705 @@ -0,0 +1,6 @@ +aut-num: AS4242422705 +as-name: PIGGY-AS +admin-c: PIGGY-DN42 +tech-c: PIGGY-DN42 +mnt-by: PIGGY-MNT +source: DN42 diff --git a/data/aut-num/AS4242422713 b/data/aut-num/AS4242422713 new file mode 100644 index 000000000..75b4f2ecd --- /dev/null +++ b/data/aut-num/AS4242422713 @@ -0,0 +1,7 @@ +aut-num: AS4242422713 +as-name: ENP2S0-AS +descr: enp2s0 AS +admin-c: ENP2S0-DN42 +tech-c: ENP2S0-DN42 +mnt-by: ENP2S0-MNT +source: DN42 diff --git a/data/aut-num/AS4242423073 b/data/aut-num/AS4242423073 new file mode 100644 index 000000000..16c7fd995 --- /dev/null +++ b/data/aut-num/AS4242423073 @@ -0,0 +1,6 @@ +aut-num: AS4242423073 +as-name: PATERNOT-AS +admin-c: PATERNOT-DN42 +tech-c: PATERNOT-DN42 +mnt-by: PATERNOT-MNT +source: DN42 diff --git a/data/aut-num/AS4242423347 b/data/aut-num/AS4242423347 new file mode 100644 index 000000000..2c2a0b5e3 --- /dev/null +++ b/data/aut-num/AS4242423347 @@ -0,0 +1,6 @@ +aut-num: AS4242423347 +as-name: TKUHACKLAB-AS +descr: Turku HackLab ASN, Finland +org: ORG-TKUHACKLAB +mnt-by: SM-MNT +source: DN42 diff --git a/data/aut-num/AS4242423953 b/data/aut-num/AS4242423953 new file mode 100644 index 000000000..8f19cd68e --- /dev/null +++ b/data/aut-num/AS4242423953 @@ -0,0 +1,22 @@ +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 diff --git a/data/aut-num/AS49752 b/data/aut-num/AS49752 deleted file mode 100644 index fd22df9a8..000000000 --- a/data/aut-num/AS49752 +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/data/aut-num/AS64742 b/data/aut-num/AS64742 index 22c3f099d..c1667f2e0 100644 --- a/data/aut-num/AS64742 +++ b/data/aut-num/AS64742 @@ -1,8 +1,8 @@ aut-num: AS64742 as-name: CHIANTOS-AS -descr: Chiantos Network - Kankan Home Network -remarks: Peerings via OpenVPN and Tinc -remarks: Peerings nodes hosted at Paris (FR) and Roubaix (FR) +descr: Chiantos Network +remarks: Peerings via Wireguard (preferred) or OpenVPN +remarks: Peering node hosted at Paris (FR) admin-c: KANKAN-DN42 tech-c: KANKAN-DN42 mnt-by: KANKAN-MNT diff --git a/data/dns/chiantos.dn42 b/data/dns/chiantos.dn42 index 17d77fe41..7040e37e3 100644 --- a/data/dns/chiantos.dn42 +++ b/data/dns/chiantos.dn42 @@ -1,6 +1,7 @@ domain: chiantos.dn42 descr: Chiantos Main Domain -nserver: haruhi.chiantos.dn42 172.23.147.225 +nserver: ns0.chiantos.dn42 172.23.147.53 +nserver: ns0.chiantos.dn42 fd8e:6470:7a23:1337::53 admin-c: KANKAN-DN42 tech-c: KANKAN-DN42 mnt-by: KANKAN-MNT diff --git a/data/dns/delegation-servers.dn42 b/data/dns/delegation-servers.dn42 index dbc787e10..b6e70c9e6 100644 --- a/data/dns/delegation-servers.dn42 +++ b/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:a526:d935:281e:22d6 +nserver: j.delegation-servers.dn42 fd42:5d71:219:1:216:3eff:fe1e: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 diff --git a/data/dns/erinn.dn42 b/data/dns/erinn.dn42 new file mode 100644 index 000000000..86a07274b --- /dev/null +++ b/data/dns/erinn.dn42 @@ -0,0 +1,10 @@ +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.150 +nserver: uladh.ns.erinn.dn42 fdfd:468b:bab6:4e53::1 +nserver: iria.ns.erinn.dn42 172.21.89.149 +nserver: iria.ns.erinn.dn42 fdfd:468b:bab6:4e53::2 +source: DN42 diff --git a/data/dns/hacklab-fi.dn42 b/data/dns/hacklab-fi.dn42 new file mode 100644 index 000000000..4af74f4da --- /dev/null +++ b/data/dns/hacklab-fi.dn42 @@ -0,0 +1,5 @@ +domain: hacklab-fi.dn42 +nserver: ns1.sm.dn42 +nserver: ns2.sm.dn42 +mnt-by: SM-MNT +source: DN42 diff --git a/data/dns/l4rs.dn42 b/data/dns/l4rs.dn42 new file mode 100644 index 000000000..3bdb74097 --- /dev/null +++ b/data/dns/l4rs.dn42 @@ -0,0 +1,9 @@ +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 diff --git a/data/dns/raito.dn42 b/data/dns/raito.dn42 new file mode 100644 index 000000000..e48c9fa27 --- /dev/null +++ b/data/dns/raito.dn42 @@ -0,0 +1,7 @@ +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 diff --git a/data/dns/truewinter.dn42 b/data/dns/truewinter.dn42 new file mode 100644 index 000000000..30c6bfb63 --- /dev/null +++ b/data/dns/truewinter.dn42 @@ -0,0 +1,9 @@ +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 diff --git a/data/dns/tyrasuki.dn42 b/data/dns/tyrasuki.dn42 deleted file mode 100644 index cd13e8cdb..000000000 --- a/data/dns/tyrasuki.dn42 +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/data/dns/yi.dn42 b/data/dns/yi.dn42 index db0609fb0..2d3562478 100644 --- a/data/dns/yi.dn42 +++ b/data/dns/yi.dn42 @@ -1,5 +1,6 @@ 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 diff --git a/data/inet6num/fd02:685f:edac::_48 b/data/inet6num/fd02:685f:edac::_48 deleted file mode 100644 index 88908030a..000000000 --- a/data/inet6num/fd02:685f:edac::_48 +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/data/inet6num/fd0a:cdb3:cde7::_48 b/data/inet6num/fd0a:cdb3:cde7::_48 new file mode 100644 index 000000000..690ee8202 --- /dev/null +++ b/data/inet6num/fd0a:cdb3:cde7::_48 @@ -0,0 +1,8 @@ +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 diff --git a/data/inet6num/fd0b:10c0:9966::_48 b/data/inet6num/fd0b:10c0:9966::_48 new file mode 100644 index 000000000..afcc7244e --- /dev/null +++ b/data/inet6num/fd0b:10c0:9966::_48 @@ -0,0 +1,8 @@ +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 diff --git a/data/inet6num/fd22:ad17:8e8d::_48 b/data/inet6num/fd22:ad17:8e8d::_48 new file mode 100644 index 000000000..ce81ac027 --- /dev/null +++ b/data/inet6num/fd22:ad17:8e8d::_48 @@ -0,0 +1,9 @@ +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 diff --git a/data/inet6num/fd39:e07d:e463::_48 b/data/inet6num/fd39:e07d:e463::_48 new file mode 100644 index 000000000..156b078c8 --- /dev/null +++ b/data/inet6num/fd39:e07d:e463::_48 @@ -0,0 +1,9 @@ +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 diff --git a/data/inet6num/fd40:2200:1975::_48 b/data/inet6num/fd40:2200:1975::_48 new file mode 100644 index 000000000..d2d4c174e --- /dev/null +++ b/data/inet6num/fd40:2200:1975::_48 @@ -0,0 +1,10 @@ +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 diff --git a/data/inet6num/fd42:6176:65::_48 b/data/inet6num/fd42:6176:65::_48 new file mode 100644 index 000000000..c1fdaa6d0 --- /dev/null +++ b/data/inet6num/fd42:6176:65::_48 @@ -0,0 +1,9 @@ +inet6num: fd42:6176:0065:0000:0000:0000:0000:0000 - fd42:6176:0065:ffff:ffff:ffff:ffff:ffff +cidr: fd42:6176:65::/48 +netname: AVE-V6-NET +descr: IPv6 Network of Ave +admin-c: AVE-DN42 +tech-c: AVE-DN42 +mnt-by: AVE-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fd49:5b5:b737::_48 b/data/inet6num/fd49:5b5:b737::_48 new file mode 100644 index 000000000..117bcd193 --- /dev/null +++ b/data/inet6num/fd49:5b5:b737::_48 @@ -0,0 +1,12 @@ +inet6num: fd49:05b5:b737:0000:0000:0000:0000:0000 - fd49:05b5:b737:ffff:ffff:ffff:ffff:ffff +cidr: fd49:5b5:b737::/48 +netname: TRUEWINTER-NETWORK +descr: Network of TRUEWINER +country: ZA +admin-c: TRUEWINTER-DN42 +tech-c: TRUEWINTER-DN42 +mnt-by: TRUEWINTER-MNT +status: ASSIGNED +nserver: ns1.truewinter.dn42 +nserver: ns2.truewinter.dn42 +source: DN42 diff --git a/data/inet6num/fd4d:ce73:68f9::_48 b/data/inet6num/fd4d:ce73:68f9::_48 new file mode 100644 index 000000000..5c23156b3 --- /dev/null +++ b/data/inet6num/fd4d:ce73:68f9::_48 @@ -0,0 +1,12 @@ +inet6num: fd4d:ce73:68f9:0000:0000:0000:0000:0000 - fd4d:ce73:68f9:ffff:ffff:ffff:ffff:ffff +cidr: fd4d:ce73:68f9::/48 +netname: RAITO-NETWORK +descr: Network of RAITO +country: FR +admin-c: RAITO-DN42 +tech-c: RAITO-DN42 +mnt-by: RAITO-MNT +status: ASSIGNED +nserver: ns1.raito.dn42 +nserver: ns2.raito.dn42 +source: DN42 diff --git a/data/inet6num/fd4f:4e49:4f4e::_48 b/data/inet6num/fd4f:4e49:4f4e::_48 new file mode 100644 index 000000000..d2696faf4 --- /dev/null +++ b/data/inet6num/fd4f:4e49:4f4e::_48 @@ -0,0 +1,14 @@ +inet6num: fd4f:4e49:4f4e:0000:0000:0000:0000:0000 - fd4f:4e49:4f4e:ffff:ffff:ffff:ffff:ffff +cidr: fd4f:4e49:4f4e::/48 +netname: ONION-NET-V3 +descr: Tor-Onion Proxy Service V3 +remarks: fd O:NI:ON - Last 80bit of MD5 Hash +country: DE +admin-c: THEQ-DN42 +tech-c: THEQ-DN42 +mnt-by: THEQ-MNT +nserver: ns1.theq.dn42 +nserver: ns2.theq.dn42 +nserver: ns3.theq.dn42 +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fd6e:cab2:576b::_48 b/data/inet6num/fd6e:cab2:576b::_48 new file mode 100644 index 000000000..4ace76158 --- /dev/null +++ b/data/inet6num/fd6e:cab2:576b::_48 @@ -0,0 +1,12 @@ +inet6num: fd6e:cab2:576b:0000:0000:0000:0000:0000 - fd6e:cab2:576b:ffff:ffff:ffff:ffff:ffff +cidr: fd6e:cab2:576b::/48 +netname: L4RS-NETWORK +descr: Network of L4RS +country: CH +admin-c: L4RS-DN42 +tech-c: L4RS-DN42 +mnt-by: L4RS-MNT +status: ASSIGNED +nserver: ns1.l4rs.dn42 +nserver: ns2.l4rs.dn42 +source: DN42 diff --git a/data/inet6num/fd6f:6e69:6f6e::_48 b/data/inet6num/fd6f:6e69:6f6e::_48 new file mode 100644 index 000000000..bdc01ab7b --- /dev/null +++ b/data/inet6num/fd6f:6e69:6f6e::_48 @@ -0,0 +1,14 @@ +inet6num: fd6f:6e69:6f6e:0000:0000:0000:0000:0000 - fd6f:6e69:6f6e:ffff:ffff:ffff:ffff:ffff +cidr: fd6f:6e69:6f6e::/48 +netname: ONION-NET-V2 +descr: Tor-Onion Proxy Service +remarks: fd o:ni:on - 80bit Onionname Mapping +country: DE +admin-c: THEQ-DN42 +tech-c: THEQ-DN42 +mnt-by: THEQ-MNT +nserver: ns1.theq.dn42 +nserver: ns2.theq.dn42 +nserver: ns3.theq.dn42 +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fd7e:7e3e:71be::_48 b/data/inet6num/fd7e:7e3e:71be::_48 new file mode 100644 index 000000000..545558282 --- /dev/null +++ b/data/inet6num/fd7e:7e3e:71be::_48 @@ -0,0 +1,10 @@ +inet6num: fd7e:7e3e:71be:0000:0000:0000:0000:0000 - fd7e:7e3e:71be:ffff:ffff:ffff:ffff:ffff +cidr: fd7e:7e3e:71be::/48 +netname: INL-NETWORK +descr: INL Network +country: TH +admin-c: INL-DN42 +tech-c: INL-DN42 +mnt-by: INL-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fd86:5946:61b2::_48 b/data/inet6num/fd86:5946:61b2::_48 new file mode 100644 index 000000000..f9b871ae4 --- /dev/null +++ b/data/inet6num/fd86:5946:61b2::_48 @@ -0,0 +1,8 @@ +inet6num: fd86:5946:61b2:0000:0000:0000:0000:0000 - fd86:5946:61b2:ffff:ffff:ffff:ffff:ffff +cidr: fd86:5946:61b2::/48 +netname: SPENCERCW-NETWORK +admin-c: SPENCERCW-DN42 +tech-c: SPENCERCW-DN42 +mnt-by: SPENCERCW-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fd8e:6470:7a23::_48 b/data/inet6num/fd8e:6470:7a23::_48 new file mode 100644 index 000000000..67ebb79cf --- /dev/null +++ b/data/inet6num/fd8e:6470:7a23::_48 @@ -0,0 +1,9 @@ +inet6num: fd8e:6470:7a23:0000:0000:0000:0000:0000 - fd8e:6470:7a23:ffff:ffff:ffff:ffff:ffff +cidr: fd8e:6470:7a23::/48 +netname: NET-CHIANTOS-DN42 +nserver: ns0.chiantos.dn42 +admin-c: KANKAN-DN42 +tech-c: KANKAN-DN42 +mnt-by: KANKAN-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fdc2:1708:72bc::_48 b/data/inet6num/fdc2:1708:72bc::_48 new file mode 100644 index 000000000..31b357260 --- /dev/null +++ b/data/inet6num/fdc2:1708:72bc::_48 @@ -0,0 +1,10 @@ +inet6num: fdc2:1708:72bc:0000:0000:0000:0000:0000 - fdc2:1708:72bc:ffff:ffff:ffff:ffff:ffff +cidr: fdc2:1708:72bc::/48 +netname: ENP2S0-V6-NET-1 +descr: enp2s0's core allocation +country: US +admin-c: ENP2S0-DN42 +tech-c: ENP2S0-DN42 +mnt-by: ENP2S0-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fdfb:42d3:9346::_48 b/data/inet6num/fdfb:42d3:9346::_48 new file mode 100644 index 000000000..e63671e44 --- /dev/null +++ b/data/inet6num/fdfb:42d3:9346::_48 @@ -0,0 +1,8 @@ +inet6num: fdfb:42d3:9346:0000:0000:0000:0000:0000 - fdfb:42d3:9346:ffff:ffff:ffff:ffff:ffff +cidr: fdfb:42d3:9346::/48 +netname: LEAH2-NET6 +admin-c: LEAH2-DN42 +tech-c: LEAH2-DN42 +mnt-by: LEAH2-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fdfd:468b:bab6::_48 b/data/inet6num/fdfd:468b:bab6::_48 new file mode 100644 index 000000000..94afe8741 --- /dev/null +++ b/data/inet6num/fdfd:468b:bab6::_48 @@ -0,0 +1,12 @@ +inet6num: fdfd:468b:bab6:0000:0000:0000:0000:0000 - fdfd:468b:bab6:ffff:ffff:ffff:ffff:ffff +cidr: fdfd:468b:bab6::/48 +netname: ERINN-NETWORK +descr: Erinn Network Main v6 +admin-c: ERINN-DN42 +tech-c: ERINN-DN42 +mnt-by: ERINN-MNT +org: ORG-ERINN +nserver: uladh.ns.erinn.dn42 +nserver: iria.ns.erinn.dn42 +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fdfd:df:5b67::_48 b/data/inet6num/fdfd:df:5b67::_48 new file mode 100644 index 000000000..9eae69fa2 --- /dev/null +++ b/data/inet6num/fdfd:df:5b67::_48 @@ -0,0 +1,10 @@ +inet6num: fdfd:00df:5b67:0000:0000:0000:0000:0000 - fdfd:00df:5b67:ffff:ffff:ffff:ffff:ffff +cidr: fdfd:df:5b67::/48 +netname: FI-TurkuHacklab-DN42-1 +country: FI +org: ORG-TKUHACKLAB +mnt-by: SM-MNT +nserver: ns1.sm.dn42 +nserver: ns2.sm.dn42 +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fdfe:bf34:baaa::_48 b/data/inet6num/fdfe:bf34:baaa::_48 new file mode 100644 index 000000000..2b044f68c --- /dev/null +++ b/data/inet6num/fdfe:bf34:baaa::_48 @@ -0,0 +1,10 @@ +inet6num: fdfe:bf34:baaa:0000:0000:0000:0000:0000 - fdfe:bf34:baaa:ffff:ffff:ffff:ffff:ffff +netname: RVALUE-IPV6 +descr: IPv6 for KOISHI-AS +country: CN +admin-c: RVALUE-DN42 +tech-c: RVALUE-DN42 +mnt-by: RVALUE-MNT +status: ASSIGNED +cidr: fdfe:bf34:baaa::/48 +source: DN42 diff --git a/data/inetnum/172.20.139.176_28 b/data/inetnum/172.20.139.176_28 new file mode 100644 index 000000000..c5678ca2c --- /dev/null +++ b/data/inetnum/172.20.139.176_28 @@ -0,0 +1,8 @@ +inetnum: 172.20.139.176 - 172.20.139.191 +cidr: 172.20.139.176/28 +netname: SPENCERCW-NETWORK +admin-c: SPENCERCW-DN42 +tech-c: SPENCERCW-DN42 +mnt-by: SPENCERCW-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.20.160.48_28 b/data/inetnum/172.20.160.48_28 new file mode 100644 index 000000000..23f045e19 --- /dev/null +++ b/data/inetnum/172.20.160.48_28 @@ -0,0 +1,10 @@ +inetnum: 172.20.160.48 - 172.20.160.63 +cidr: 172.20.160.48/28 +netname: L4RS-NETWORK +admin-c: L4RS-DN42 +tech-c: L4RS-DN42 +mnt-by: L4RS-MNT +status: ASSIGNED +nserver: ns1.l4rs.dn42 +nserver: ns2.l4rs.dn42 +source: DN42 diff --git a/data/inetnum/172.20.192.96_27 b/data/inetnum/172.20.192.96_27 new file mode 100644 index 000000000..e5814eada --- /dev/null +++ b/data/inetnum/172.20.192.96_27 @@ -0,0 +1,9 @@ +inetnum: 172.20.192.96 - 172.20.192.127 +netname: INLNETWORK-NET4-1 +country: TH +admin-c: INL-DN42 +tech-c: INL-DN42 +mnt-by: INL-MNT +status: ASSIGNED +cidr: 172.20.192.96/27 +source: DN42 diff --git a/data/inetnum/172.20.207.192_27 b/data/inetnum/172.20.207.192_27 new file mode 100644 index 000000000..8161bc28a --- /dev/null +++ b/data/inetnum/172.20.207.192_27 @@ -0,0 +1,10 @@ +inetnum: 172.20.207.192 - 172.20.207.223 +cidr: 172.20.207.192/27 +netname: TRUEWINTER-NETWORK +admin-c: TRUEWINTER-DN42 +tech-c: TRUEWINTER-DN42 +mnt-by: TRUEWINTER-MNT +status: ASSIGNED +nserver: ns1.truewinter.dn42 +nserver: ns2.truewinter.dn42 +source: DN42 diff --git a/data/inetnum/172.20.236.64_29 b/data/inetnum/172.20.236.64_29 new file mode 100644 index 000000000..e87960ead --- /dev/null +++ b/data/inetnum/172.20.236.64_29 @@ -0,0 +1,8 @@ +inetnum: 172.20.236.64 - 172.20.236.71 +cidr: 172.20.236.64/29 +netname: SHYPRE-NETWORK +admin-c: SHYPRE-DN42 +tech-c: SHYPRE-DN42 +mnt-by: SHYPRE-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.21.105.144_28 b/data/inetnum/172.21.105.144_28 new file mode 100644 index 000000000..ce5e132b4 --- /dev/null +++ b/data/inetnum/172.21.105.144_28 @@ -0,0 +1,11 @@ +inetnum: 172.21.105.144 - 172.21.105.159 +netname: RVALUE-IPV4 +remarks: IPv4 block 1 for KOISHI-AS +descr: IPv4 block 1 for KOISHI-AS +country: CN +admin-c: RVALUE-DN42 +tech-c: RVALUE-DN42 +mnt-by: RVALUE-MNT +status: ASSIGNED +cidr: 172.21.105.144/28 +source: DN42 diff --git a/data/inetnum/172.21.117.32_27 b/data/inetnum/172.21.117.32_27 new file mode 100644 index 000000000..66590ac6c --- /dev/null +++ b/data/inetnum/172.21.117.32_27 @@ -0,0 +1,8 @@ +inetnum: 172.21.117.32 - 172.21.117.63 +cidr: 172.21.117.32/27 +netname: PIGGY-NETWORK +admin-c: PIGGY-DN42 +tech-c: PIGGY-DN42 +mnt-by: PIGGY-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.21.66.224_27 b/data/inetnum/172.21.66.224_27 new file mode 100644 index 000000000..d1dfe8569 --- /dev/null +++ b/data/inetnum/172.21.66.224_27 @@ -0,0 +1,8 @@ +inetnum: 172.21.66.224 - 172.21.66.255 +cidr: 172.21.66.224/27 +netname: TRACE-NET +status: ASSIGNED +admin-c: TRACE-DN42 +tech-c: TRACE-DN42 +mnt-by: TRACE-MNT +source: DN42 diff --git a/data/inetnum/172.21.89.128_26 b/data/inetnum/172.21.89.128_26 new file mode 100644 index 000000000..3bac72c1b --- /dev/null +++ b/data/inetnum/172.21.89.128_26 @@ -0,0 +1,12 @@ +inetnum: 172.21.89.128 - 172.21.89.191 +cidr: 172.21.89.128/26 +netname: ERINN-NETWORK +descr: Erinn Network Main v4 +admin-c: ERINN-DN42 +tech-c: ERINN-DN42 +org: ORG-ERINN +mnt-by: ERINN-MNT +nserver: uladh.ns.erinn.dn42 +nserver: iria.ns.erinn.dn42 +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.22.105.64_27 b/data/inetnum/172.22.105.64_27 new file mode 100644 index 000000000..1c3bc9fd9 --- /dev/null +++ b/data/inetnum/172.22.105.64_27 @@ -0,0 +1,10 @@ +inetnum: 172.22.105.64 - 172.22.105.95 +netname: FL-NET4 +descr: fl +country: FR +admin-c: FL-DN42 +tech-c: FL-DN42 +mnt-by: FL-MNT +status: ASSIGNED +cidr: 172.22.105.64/27 +source: DN42 diff --git a/data/inetnum/172.22.122.160_27 b/data/inetnum/172.22.122.160_27 new file mode 100644 index 000000000..abedff1c3 --- /dev/null +++ b/data/inetnum/172.22.122.160_27 @@ -0,0 +1,9 @@ +inetnum: 172.22.122.160 - 172.22.122.191 +cidr: 172.22.122.160/27 +netname: AVE-V4-NET +descr: IPv4 Network of Ave +admin-c: AVE-DN42 +tech-c: AVE-DN42 +mnt-by: AVE-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.22.177.0_27 b/data/inetnum/172.22.177.0_27 deleted file mode 100644 index dda858aef..000000000 --- a/data/inetnum/172.22.177.0_27 +++ /dev/null @@ -1,12 +0,0 @@ -inetnum: 172.22.177.0 - 172.22.177.31 -cidr: 172.22.177.0/27 -netname: REDPANDANETWORK-LEGACY -org: ORG-REDPANDANETWORK -descr: Red Panda Network - Legacy allocation -admin-c: REDP-DN42 -tech-c: REDP-DN42 -nserver: ns1.tyrasuki.dn42 -nserver: ns2.tyrasuki.dn42 -status: ASSIGNED PI -mnt-by: REDPANDA-MNT -source: DN42 diff --git a/data/inetnum/172.22.189.104_29 b/data/inetnum/172.22.189.104_29 new file mode 100644 index 000000000..9a2f04b88 --- /dev/null +++ b/data/inetnum/172.22.189.104_29 @@ -0,0 +1,8 @@ +inetnum: 172.22.189.104 - 172.22.189.111 +cidr: 172.22.189.104/29 +netname: YI-NET-002 +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.22.189.112_29 b/data/inetnum/172.22.189.112_29 new file mode 100644 index 000000000..2e808d136 --- /dev/null +++ b/data/inetnum/172.22.189.112_29 @@ -0,0 +1,9 @@ +inetnum: 172.22.189.112 - 172.22.189.119 +cidr: 172.22.189.112/29 +netname: YI-NET-003 +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +mnt-by: HONDA-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.22.189.120_29 b/data/inetnum/172.22.189.120_29 new file mode 100644 index 000000000..960af5280 --- /dev/null +++ b/data/inetnum/172.22.189.120_29 @@ -0,0 +1,8 @@ +inetnum: 172.22.189.120 - 172.22.189.127 +cidr: 172.22.189.120/29 +netname: YI-NET-004 +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.22.189.96_27 b/data/inetnum/172.22.189.96_29 similarity index 65% rename from data/inetnum/172.22.189.96_27 rename to data/inetnum/172.22.189.96_29 index 651cfe646..9b3f5ff96 100644 --- a/data/inetnum/172.22.189.96_27 +++ b/data/inetnum/172.22.189.96_29 @@ -1,5 +1,5 @@ -inetnum: 172.22.189.96 - 172.22.189.127 -cidr: 172.22.189.96/27 +inetnum: 172.22.189.96 - 172.22.189.103 +cidr: 172.22.189.96/29 netname: YI-NET-001 admin-c: YI-DN42 tech-c: YI-DN42 diff --git a/data/inetnum/172.23.147.0_24 b/data/inetnum/172.23.147.0_24 index 8ce50906d..d562cb7d7 100644 --- a/data/inetnum/172.23.147.0_24 +++ b/data/inetnum/172.23.147.0_24 @@ -1,8 +1,7 @@ inetnum: 172.23.147.0 - 172.23.147.255 netname: NET-CHIANTOS-DN42 descr: Chiantos Main IP Block -country: FR -nserver: haruhi.chiantos.dn42 +nserver: ns0.chiantos.dn42 admin-c: KANKAN-DN42 tech-c: KANKAN-DN42 mnt-by: KANKAN-MNT diff --git a/data/key-cert/PGPKEY-C7B302FA b/data/key-cert/PGPKEY-C7B302FA new file mode 100644 index 000000000..2ddbe1650 --- /dev/null +++ b/data/key-cert/PGPKEY-C7B302FA @@ -0,0 +1,49 @@ +key-cert: PGPKEY-C7B302FA +method: PGP +fingerpr: 8A6E BB6D 7631 05B1 BEA1 7D7B A03A D4D5 C7B3 02FA +owner: Michael Lin +admin-c: SHYPRE-DN42 +tech-c: SHYPRE-DN42 +mnt-by: SHYPRE-MNT +source: DN42 +certif: -----BEGIN PGP PUBLIC KEY BLOCK----- +certif: +certif: mQGNBF9CwLMBDACkFhkGq7lwkx6uQok2iARr8FfkG2zmNamuK4IpH045zRl3+ioP +certif: VFZDR8FfKQ2DPWNLcH32XOUSBCM+vQmPuNRUE1EPBxddMycRNgbVFVXhvPsQ5YKt +certif: oBTZOh6gsb7fTDpqOpDE/C7b/YhhtsqY/lfLYqYF3bbMIIQsEHqcxybyX4t4hPK8 +certif: XoFNQjN512+X85dHRVULvfcGWdKVO+PB2XqCvQ2EXHIGC4zWybrGiScdpSHjnNnz +certif: L+SVrY10NxGZJ/vjXj+oJB4g2Y3/mm6D810AEGi+meguOsu4EWUTBczK0lsnv0/R +certif: 3RmCPAe/Oyw7e9gMihR9lXwGJwWUDAN5XlH46e0OVAWXOumUi3jfScliksK3IEhY +certif: W4Qwp5tGtgl4qLiAvI5E/FKAaaoRSnSuHuhWJgHDiW9EO+pZCdEJK/6GViAkpjC8 +certif: m28waUTCwZX+CS34s5U69vYkvxyFrrYmQ+T5WM2jAo41J2xErqAREmlYef4VgtNW +certif: 8lRJ1afEnVcrsJcAEQEAAbQgTWljaGFlbCBMaW4gPHNoeXByZWEyQGdtYWlsLmNv +certif: bT6JAdQEEwEKAD4WIQSKbrttdjEFsb6hfXugOtTVx7MC+gUCX0LAswIbAwUJA8Jn +certif: AAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCgOtTVx7MC+tx9C/49TamJAA5F +certif: Ucr8cVDkhs7vSj9LadgqdxYOkI4zZszpSp5WL0m9iruHUOnGm9/P+YpT7xttD2Xi +certif: 6+3StqtHQDh/Km3GfaK44RquLSJLbuT1guPxnB2/zV13wctLqoEJSV7ndt29aD7s +certif: TBibHeAbizLaC09WNfYbGgYK3V85W1esI60TWPZFE7k+l5QOxyEEmujA/xSrf1sg +certif: diyf6/Ck0tmKL/rUlFM7s9NIxaPVMr5sd1AfKtMPFaEHXc0ppkDj639LDB4PXBPs +certif: zY3LXq/gpGq8N+cxr/rPBJ9HGUFWEN4/P8fMpM4d92RCzUG2QT908xUcoIrDQOtQ +certif: nJUto+UxyQLyYadJOkKQoIMBODtasUczQ9OoHsL/QJSKrFb9D1h5IPZH4Y4+eXyT +certif: HxXbM8ON5+9IAusvtumrS4RG2fA4zicxlICmHXw2USOPxy6/lSVuK3bk2zDn5/H5 +certif: 7FiHqiOOFWN9CyBeMsvmE4aKujD9ArrmvWkiWp8JTCxDqNlfaAmUkpi5AY0EX0LA +certif: swEMAJXR4IWNKtkmJS0xx0q46aUfKKzbj/Md0PVGkThhuP2ZD+MK/234+zHrAFFS +certif: XBpPXBuXam+HGH6zOGyEKAZtxB82jRG9rPfYiTSSe2mYguFoINSzzTBREh2T6m3c +certif: kK2zaLiV0U6iKgEekSYnwZO3sp7dS2yURJIHWGN0SDwsE3IEUh09uGxKS04ArjtG +certif: U0d+RkyNN+NAw6KB1wDVe7FMrTw0VV664osUgnFeZD5wdCpU/K9ujA4kbd+gbg2K +certif: 7rln48pZ3QB3io5G6hMAn9HuNKRNIfupHyh5pn/9XGBIhW0yrSlPXgn02949ovI3 +certif: Vu43I4t8Hh4qowF0/jz5O8Pzn1XGRM8frCZ+aJDu4NTOmNLBB+w9CX1NIWYddhDC +certif: z5p0db+8RUh5cHhJrJ05hUCytGl8GBBrZ3xp2zskiTLw8O1EavgKjv3d/4P2sWGc +certif: mSGhPi2mXGSY47PIBHtxzw1xS3gHZ/EI9EiZEMDgATKCKXqOW8OSlIrfIqQXM8dm +certif: AeZqwwARAQABiQG8BBgBCgAmFiEEim67bXYxBbG+oX17oDrU1cezAvoFAl9CwLMC +certif: GwwFCQPCZwAACgkQoDrU1cezAvohrQv/V3zZSQMjm4KKflSZp7W9y1sCqqdRkBD9 +certif: SAcaGbOGoYoOGdRoBQ9lAaAk728bKLevDgigF1MIo/dVxf7fm48vdOULWrACm0CC +certif: M58fg4IwWaXHv8D7FgwXHNCJJ6ES3ruTEwEG/rb7DYuczNoZQ2uE8HWU1CYcZ6Kn +certif: MZA528Z8etMKoLfjIooQ5RxHQSqocPNmnCopfuMLvPL7DihymfZghrS49noDurJJ +certif: 6y2cbZBtyqhGD9KSJeZgPJYNQEdmVN7HzlGEvEBcQ2BaNF5tpiCp/IHxNmqfTOS5 +certif: BZU4F1KltniVSrISON9nQg+xiO/OSaaxXYfoaFFJQHDIXUnHScE5gOSn7sa5e5su +certif: n0fxDMDs9PQvsauVMtkQEyJ8895i95y2xD2uKjYi7sp6o816DyuldsX6NgvAD7Rz +certif: JJU6/CvLd8/U+E/NSKepp8p2mnpt0Rdg/TCmamx3dKk/VUrQL1vB1IBDYr84xOn+ +certif: OrS0axORDdMIruRtl7Ps7Vngd0LEBkJH +certif: =dKvs +certif: -----END PGP PUBLIC KEY BLOCK----- diff --git a/data/mntner/AVE-MNT b/data/mntner/AVE-MNT new file mode 100644 index 000000000..03ad82864 --- /dev/null +++ b/data/mntner/AVE-MNT @@ -0,0 +1,6 @@ +mntner: AVE-MNT +admin-c: AVE-DN42 +tech-c: AVE-DN42 +mnt-by: AVE-MNT +auth: pgp-fingerprint 1FFCCBE8858AD07D34C2C434398DD7BD03276F6D +source: DN42 diff --git a/data/mntner/ENP2S0-MNT b/data/mntner/ENP2S0-MNT new file mode 100644 index 000000000..0b6b96cfc --- /dev/null +++ b/data/mntner/ENP2S0-MNT @@ -0,0 +1,6 @@ +mntner: ENP2S0-MNT +admin-c: ENP2S0-DN42 +tech-c: ENP2S0-DN42 +mnt-by: ENP2S0-MNT +source: DN42 +auth: pgp-fingerprint C6C8E4808F04EBEAF773970299244FB9C0E86ED0 diff --git a/data/mntner/ERINN-MNT b/data/mntner/ERINN-MNT new file mode 100644 index 000000000..3f6cd105b --- /dev/null +++ b/data/mntner/ERINN-MNT @@ -0,0 +1,6 @@ +mntner: ERINN-MNT +admin-c: ERINN-DN42 +tech-c: ERINN-DN42 +mnt-by: ERINN-MNT +auth: pgp-fingerprint 7C2377650FC13D6834AEDD471869846028724363 +source: DN42 diff --git a/data/mntner/FL-MNT b/data/mntner/FL-MNT new file mode 100644 index 000000000..9c2752498 --- /dev/null +++ b/data/mntner/FL-MNT @@ -0,0 +1,6 @@ +mntner: FL-MNT +admin-c: FL-DN42 +tech-c: FL-DN42 +mnt-by: FL-MNT +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBKm8cLgolFSmqcBGYhpTrfzDKfTI1pZupN4Oc62/tNhLuevKocgO6LCvf+swGvK8NaFyeZKhbB75YF/dKl8OlLglR8OOlfK+5uSNK/IK2RJnvqJTcIRigRH5HhWYuXm8XMqVGqrwg7P4gImIniKm9zvSkxygwSQWCo0HdJ5Z45qZcbDD7ZoNiqewlB2rU5/jVSMLS7hLZeNofM4KNIEromDZx4QMXyHYlzs6sD8b1Rlg65UiGaPvrGnIvtQ2BVXlBZ8cZgzdO3lZol8eX37m0XGcGv/5zEgTQPvDJfK/kYvPrgsF+6a9dCqjdmjOeOqL1ImuqNZuTB1qMhjpWw/DB loui@fl.mp.ls +source: DN42 diff --git a/data/mntner/HONDA-MNT b/data/mntner/HONDA-MNT new file mode 100644 index 000000000..fc250b6f0 --- /dev/null +++ b/data/mntner/HONDA-MNT @@ -0,0 +1,6 @@ +mntner: HONDA-MNT +admin-c: HONDA-DN42 +tech-c: HONDA-DN42 +mnt-by: HONDA-MNT +auth: pgp-fingerprint 8FC0FCA60F924733D6F54A9AE73D967E318502EC +source: DN42 \ No newline at end of file diff --git a/data/mntner/INL-MNT b/data/mntner/INL-MNT new file mode 100644 index 000000000..f94492d1e --- /dev/null +++ b/data/mntner/INL-MNT @@ -0,0 +1,7 @@ +mntner: INL-MNT +descr: INL Network Lab +admin-c: INL-DN42 +tech-c: INL-DN42 +mnt-by: INL-MNT +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDlg8wY9qylYupogY15Q7SOZVDUiI4oB/h7mxLyQWItyfpDm6CboMouadpJB8sMeRSaBrelO2P2dJezeEG4pmT5P1k9eKnj9Wfghjd/AKUZCUK6SGnaz7iijguflViJdn2Ib/kYv2ckf9X+MsmrZHKWZRt0TtstsC0oAhVRYWSkTdwD6AU5Ct81Ek21ZNbSmXeUHeWwEqUZW8qofH+KiqsMLNdiAsFV/87ITwl1b/vIGAH3P/ZPQNdCv+0YumRId8IJfcLovq495uoY8LQqxoddXxQwm3ESxOttaN/i766n8PN/AnCnUzYezZ/OV+bjR/RTnaqSDcBEiXA2+eY3/3d +source: DN42 diff --git a/data/mntner/KANKAN-MNT b/data/mntner/KANKAN-MNT index 79f35d79b..2f5c9ac92 100644 --- a/data/mntner/KANKAN-MNT +++ b/data/mntner/KANKAN-MNT @@ -2,4 +2,5 @@ mntner: KANKAN-MNT admin-c: KANKAN-DN42 tech-c: KANKAN-DN42 mnt-by: KANKAN-MNT +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDouodRiuPO73u2Z7eYIOgoBsTrRNcZmFgXNvR68wLHHfPIVvD4eU1nYVatBs2+GE2NKDGA0ihmJIl/rXPgYQeuQHvBNZfuYnV7zaGZFRmiblucOpFDy0CLmKZbT5dJCVfOcxoSktxw+tYRvPd6ittHmK+nTHIIT+rcP8YeMgQZb1fHrnEs8RtPZH7Q2LrT2HPdyDQlm6Q1yjFgPjrJtbLbAURlY72DocL53zgdToBffGl1qj1nUl0rhHfUB184rfpiQuF6scyy3IS+H8zCwEqDRd13h/B54G0DPQNM+LcYnNFxQjAVVLc+8ku0jyM065oIaQTXSoOrvkxn4ic1eV7ft2JcPaEAdLKlBOEmNXeOt/yNQhNsVp2IdTVFxSsyQHkluKdl1Fj+oPht/Jfrf5NwtIMV+A4ltLN9a5LbuMMZISBXoMwe2oS37wHBFBQTkGx4konuUeumTdfNcNE5cG7+o49YaQY5LW8U0jcKjgYhsMqCPSMXuymmRHHTxru1xjs= source: DN42 diff --git a/data/mntner/L4RS-MNT b/data/mntner/L4RS-MNT new file mode 100644 index 000000000..0b0790a65 --- /dev/null +++ b/data/mntner/L4RS-MNT @@ -0,0 +1,6 @@ +mntner: L4RS-MNT +admin-c: L4RS-DN42 +tech-c: L4RS-DN42 +mnt-by: L4RS-MNT +auth: pgp-fingerprint 314EE125D2A9F136B813A076DEE652127CA586B9 +source: DN42 diff --git a/data/mntner/LEAH2-MNT b/data/mntner/LEAH2-MNT new file mode 100644 index 000000000..c67b47d5d --- /dev/null +++ b/data/mntner/LEAH2-MNT @@ -0,0 +1,7 @@ +mntner: LEAH2-MNT +admin-c: LEAH2-DN42 +tech-c: LEAH2-DN42 +mnt-by: LEAH2-MNT +auth: pgp-fingerprint E6F6848A1B95EE313CF5B7EE95FF633C90A8F025 +auth: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4o/ncaQUorp/BeZesPnVhzvfoqLJW3WZHtz+CWQvFU +source: DN42 diff --git a/data/mntner/LINUXGEMINI-MNT b/data/mntner/LINUXGEMINI-MNT index ff4f02ae4..e1f4c8757 100644 --- a/data/mntner/LINUXGEMINI-MNT +++ b/data/mntner/LINUXGEMINI-MNT @@ -4,6 +4,6 @@ tech-c: LINUXGEMINI-DN42 mnt-by: LINUXGEMINI-MNT auth: pgp-fingerprint B10F74F5317933948E6F95A6996472A481D15951 auth: ssh-rsa AAAAB3NzaC1yc2EAAAABJQAABAEAnfJ+R6rU1+egGgomd0DREVzR/RLUGBmXI/OaTn3zK9mooLW9HFHz5heQnKZ94jjkT9FZIuXP9Bk6uKvGmZ8dihlE7nqWsz+kWNB7e6sOstzua+k/HOsfX0TZAQdR09G+u+71XptjuxiR9L+0r0r8V3dk8JjDl8YLcXYKYQIIZbwcnKJ0+MPZ12v2R1DmTxUXSpM0ak9CEB5Az04WqxamsXFxHlH5urmpllVc1otrT2c/4heRc3JxVzAlKNPfId3G2vXO7kwSLuIc8RyH1K4KRl2bHSEWcZjHautxoraa+C2arLUmcyrHnpILVRjNizs8Msu9CQnLeuvKr21hcNjUQQpSfREknog9vwWK0eJ4C95CnuIAZQ+olQpRHEVuBG1nRAoGjjw5f1COwhttHnoBKu8PAiKqJYFvsyhOE7Mx6/HehB+nsaLptlgbygD7ANOzfjUoB/VnheS57E3LHeaPpaBHs14Xe6Bhc96kf5ZK3c9ZU21ArhMnA7nUc8XF0bQg17PfUh894rtCPMw1olhCsx3gkkjd6aenTkIBwjfBXYjKEAKVyiBKh8M1u4JMdTzWOUBn7b1ulInP2r/MWvuhteQZD2eu8DOZm+B7xsu0umHH3pupDjTRZmlIjJrAUOPDghK6f28kLUctE7puQHgVYp7MQjDyDs9qkrem/sZW+FrWyeM8+vPl6QW6GlpIBYAtmuOAZ980NUwS/MGlBkYio0MdNULIMu+T5Da0Dtu7bR7qm486lUaRPFfWOKwYNRtoDRbVCnVqPBDfA23n7WdSVNhh7mA9nNcY3HmD/orAAtocrT0hjsLYqJtBMEV0ovyeYshNfPTHXOkXHFj332DXtWk9jDRXGgCbmCGMunLNwhTCi1whYHIMFN2ajWfE2gkpzqxgzxRw2cSF+aG9SDR2mHdjC66/27FgYjRJpqhFlnl0rTCDDeAavkVKJmC5+QNBussAWQjpK1b1ogsoZLeo+S8C2e8U9YQxVM07+wSdkAO5+EMoYSZ9ayw/s7pOLANkGD6sieRE+BxxUP+fI1J/oKxkFrmMThluBxEOIeNhnfsxnOOrOQoxdSQcFeX7PstNk1LxWhpjVomoIkk+Q8TGY/9dop/RiwrZkFG8Yi9ObNnYLcmVJMaBMT3t/Yg/0FQXHlzPt2y3Aj159zrdpCuROORt7XtNn6EHEdZNsw/XSR01kjtUkOv7mr1G1QESC+8lw79I6eNU37WqCk8UvZ6JF6JoqNb52Wc893fnc3Nql+8s1IXOKs70ot2W8X4OMwaISc36RZiW/rA3dIjVFcA03dGTzksMr4RuKl/x2FUCtZyLxUw3qmJOxxrK56PFXwfcjRrn1wNM2y9Qx9CosdeXUw== -auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQCUTYTr0mfj5wloGXd8K6cab2AsAL4vILnMUGLU9piHkyF4a/TdHqHAtG6+TJnjk1Td85HEugb75ovQ+OPcJTIsOvBePjqjAXfPXiwYjZziXRl8hzBETh2giB9zJVc4+Qk61ULnACsRV2rZ7YbS2zwi4ut256hs2qrvSISRRjp0L/E+9QZnTe03REXrDmBEl9NGgBzLTJWifqoWrW5uqEZwndMwlanroyzJ8Plg3RegUeAUyvCG002iRHceLYk/wztIvqh72tuMdgYgc4lkhaczZEK+JDOANIdMS9J1gzQRdbcEydxCso4VIcvtQmPSkrzKUfqTTDZ4vc3Td2s5cOztIJophm3fHJ+ds8qbAmQJC1z2XtumJXTgsxOWEr++tXd1Mg1CoOmpU9BFH9blcmEilUFf+uRIQkRe2azDQn06UF3zzUa7OxqmScbmQ5T4DNkHyWxtkg/GyCFiQ/fDzyo4evM6EUui8jR8UPZC8zEZw7lPUCz6kEZTjJoaPa/G42EZ85Rjttim/0rWfrNqnNOHxSu82rpnNNdc+z2E6xwpdVHyIJmiR0e1NBHoen1d/OQJYHbenyhUk2CryPqufQ32+z+oakT/eic00lQ46W6/EMxUGSbhNreoz4VLerOznJqavRWR17fAqS/0oJX7Sx6m8BUq5G5tD5PAxxYgI8fd3U9dxfmhxctSaOWE34PlmLExFKq+HsXYuh1wfV9QlGVGu4vAF2t6zpZ58rcdpkfe4DwCyKvX3ziV1N5sZPrD6Y7CE3uHvBzWYuTJemmXPZU3lx5j/BidGn9A2OD7NOz3GN7wdij4z1L3GC4haCcyj7o+FofQxdGlsxTJ7NP32gLIWHZKfW8gaVdL+niYsNSOsmH4uAAITvXqWsrr8rIT11+fbJPRK6sNRxFOqALgAeKf29MG62sZAcREYKuigBjr5ib9Vqrah7IOD3w1SIqokwWyb+dY9rsh91RH09GzqJVFLQ8uJx9DrTwC5/i7xi/ScWOqeAgA6P+T1Nvs95WLu2a3WKv/P3lZ51zRcNPA/lfsyPVJAktdypOPx07LPoirsrqnClyjAOOs8Yl5KXQ40htskE/T7fSIdOw3DQUFBwf3jwkhrxBKvT3SJH1nES5scjiJnZiMwBZxVmrSKrXKu/f41baPt4shtPU7TfDarbaiACPufvSnFLJPIfpY2XkpnALf7Kn3zrYXpY8f840Que7GB/8+mfj/4yrvqSsDFF0rCzsZRyXcihDM4Je/JELeiZFbk5uQIQI7HNB7MqDpudNJACwppDKUgE+7hbxO3PuqsbIR3sV5QQvnR9R/5BZnFresJHUyybGFSsQ2D0jJjdcbKUMVGFmHs7P/TTDduagl -auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDbYd9Js8uvKO5mPUd8+fr0jewwqXeeo7tEB+3ttvvqEQYzmE4ESQEsIK6OUWwc0R3mUG1wc4+6tfn70BUAklg80dl52JSubqfvPljuTrhGUKmX2AfFwxwNviaez8UHbNwAdrIYvLC4jsvjqXpnnwgl8FB26Z/E9hiUzBuiGUSAZJRggsKrdd+qrYSh66him11WYa2ENVWAvuKQNdfW+uEs2IIj71bKP9w1vbGACZYD5O3pVqQCZRuiEWfygqZbI7ZLJAr9UcmIYev40tNLqKJbZX0q6mPm4iX2pqV+051ekKFegH2hibiVasp5w5sn8eTDxHx/UZRrr3sk+8w3IVe01o0pqlv/HehwD4u2eCdNBhwTA62xRIuL/3BCO/c/ov4b5KzbMNeXOxjmHDlCI2qFg+guvZxyS+ZL9jRP10TUqtXKgP/wbUsvgCRthGvMXgbjnvcNk3DkSErQ5VPG6JimrR7Ir19ZCZOg/q/Xju8siY2aWvwcshbro8lejf7HpCmuiTENYchH+6UBaKQYl1wvFk9Wkpnw5lz0DF74wV3GKl8nuYXPygZmta704+l8EE2g8FCH/jq7TvrOS6Ab+g+uN4/dcQmvjh0o6OlVUr6PsyuRszgyYJMUeVa1ui6IuYWH2G5F4bW4WwHsbDn59g0zpVnOF6InqfxJuSDijWUnlQ== +auth: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM0E1M4WmUwX7FOkYTv2Tbx0nG1+qMqmVrSnipDk4B71 +auth: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAxMsmmKCIIVPe+ejQjmO7UFm3Vxer2LxD7oKz5y/OCp source: DN42 diff --git a/data/mntner/PATERNOT-MNT b/data/mntner/PATERNOT-MNT new file mode 100644 index 000000000..fac8148d1 --- /dev/null +++ b/data/mntner/PATERNOT-MNT @@ -0,0 +1,6 @@ +mntner: PATERNOT-MNT +admin-c: PATERNOT-DN42 +tech-c: PATERNOT-DN42 +mnt-by: PATERNOT-MNT +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCsyGAnEyTt6ozgBjkHJ/InB6DJrHgmRAvBDv+3/5shLNxejxtr7EBquLw2HZd1YoiozByIE6T5VUwTY5T74alL2OnMNxC3+LCfspc0JRt2hrId/NHQyBCaEBvDKPGk03qAb3T7WdBAbVCOnDJIlIcmLp7JLAcWJLoETBhX8icAdADIDkfh3kIE4QfgYThlh/mSHOY8uYtTS3tbLkupdtwtxAuCSjcaBjApsLccM+S4p/+Dxjj3/3lRRr3ilBjQ7cppXsQsx38e735KttaZ3V4Ol/WQcVWpWICkY4EEjw9ZKOjmt64FtA/38DsuKskdS/xhshR1KJF0aiszPDIJ0C8DJ7441GIWSKeS/3vR/X2VDTq96V9lk8OcMEQY4sa266D5eyMo6KZLQGlixTF2fkWx2L0WV4WPcuhvGbyNVp2TrkKsmh1+I7QxuPruMxPPNeIObRECtV8t0LcaMZIES4lc5ucz+hJpRRglzrBHso+2RclGd7+tlKbdeB1Jtz1O8A/G56A82rkJgHVHccz+irEOmNDi15wp2fXuPoD9cs8rRxzglkONiA06aKVmhaMM77xP7QgKEEjrjlg0hHzXg/DNsGDHF+GkRLBn9wdCB8kvyLjiOE43pKZhdfH2Z5H60GXaquEr3LUMt2X84DIxyKxb5kReGW2y+JvtFmQpqslqhw== +source: DN42 diff --git a/data/mntner/PIGGY-MNT b/data/mntner/PIGGY-MNT new file mode 100644 index 000000000..19436209b --- /dev/null +++ b/data/mntner/PIGGY-MNT @@ -0,0 +1,6 @@ +mntner: PIGGY-MNT +admin-c: PIGGY-DN42 +tech-c: PIGGY-DN42 +mnt-by: PIGGY-MNT +auth: pgp-fingerprint 2AF061CA67AB9E63254A552193A2530ACDB33DE7 +source: DN42 diff --git a/data/mntner/RAITO-MNT b/data/mntner/RAITO-MNT new file mode 100644 index 000000000..7ed1bfab2 --- /dev/null +++ b/data/mntner/RAITO-MNT @@ -0,0 +1,6 @@ +mntner: RAITO-MNT +admin-c: RAITO-DN42 +tech-c: RAITO-DN42 +mnt-by: RAITO-MNT +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcEkYM1r8QVNM/G5CxJInEdoBCWjEHHDdHlzDYNSUIdHHsn04QY+XI67AdMCm8w30GZnLUIj5RiJEWXREUApby0GrfxGGcy8otforygfgtmuUKAUEHdU2MMwrQI7RtTZ8oQ0USRGuqvmegxz3l5caVU7qGvBllJ4NUHXrkZSja2/51vq80RF4MKkDGiz7xUTixI2UcBwQBCA/kQedKV9G28EH+1XfvePqmMivZjl+7VyHsgUVj9eRGA1XWFw59UPZG8a7VkxO/Eb3K9NF297HUAcFMcbY6cPFi9AaBgu3VC4eetDnoN/+xT1owiHi7BReQhGAy/6cdf7C/my5ehZwD +source: DN42 diff --git a/data/mntner/REDPANDA-MNT b/data/mntner/REDPANDA-MNT deleted file mode 100644 index cd3ea4c1f..000000000 --- a/data/mntner/REDPANDA-MNT +++ /dev/null @@ -1,6 +0,0 @@ -mntner: REDPANDA-MNT -admin-c: REDP-DN42 -tech-c: REDP-DN42 -mnt-by: REDPANDA-MNT -auth: pgp-fingerprint 9B91F44036C04F172D7E2C4227A401F86B85D0BC -source: DN42 diff --git a/data/mntner/RVALUE-MNT b/data/mntner/RVALUE-MNT new file mode 100644 index 000000000..ea25529b9 --- /dev/null +++ b/data/mntner/RVALUE-MNT @@ -0,0 +1,8 @@ +mntner: RVALUE-MNT +admin-c: RVALUE-DN42 +tech-c: RVALUE-DN42 +mnt-by: RVALUE-MNT +source: DN42 +auth: pgp-fingerprint 567C9C06132B1586BD4E6EBED842AFBEB0D66387 +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDMdZxymWKJqegdWnJ7RJLskHxW/Rt0H8+BEw135mBfov4MYIzyJ1FZf+W9IctqKVHq+FSwChP9GiPr7cgihHIECUqujyfjaiKIe/LURLJbIomKT+7GOHwPM5ZK/ou558NWhbIWMIAlKbYRGGspTh86ZtKIlNZ9VKPouVsqr/RMFJN2axRukxTyH2fU7VJIV9O6Q3lQslFgYkw4GItMQ1t2Y2/4YRuR1kQST2Udl+EkNFwjc6Gh3Pe45g1IU0/xmxYU8/iScVqcs+CIvfnvHBcFawPUFlLa85jQ+cPMLlDq84WkBvYVL/zoEy8DgkkPVNznwwORNiDbXWHPnP3RBabFQFvnLCP6gGHSejG3obauJl5VMmFAnMnBfAZQlXhNj1+M1NejWDJnjoasV3fNCrlKF60X8+Brcysz/grZOoKoZ928OZfo1XD0lpC6JRPGwapz249mmdwm65O0ccFg2nNsAWfGRkmhjSCPL7E8teu3NceQXctnrJmg4r+u/fvuwCs= +remarks: None diff --git a/data/mntner/SHYPRE-MNT b/data/mntner/SHYPRE-MNT new file mode 100644 index 000000000..e925c6b77 --- /dev/null +++ b/data/mntner/SHYPRE-MNT @@ -0,0 +1,6 @@ +mntner: SHYPRE-MNT +admin-c: SHYPRE-DN42 +tech-c: SHYPRE-DN42 +mnt-by: SHYPRE-MNT +auth: PGPKEY-C7B302FA +source: DN42 diff --git a/data/mntner/SPENCERCW-MNT b/data/mntner/SPENCERCW-MNT new file mode 100644 index 000000000..3adffd596 --- /dev/null +++ b/data/mntner/SPENCERCW-MNT @@ -0,0 +1,6 @@ +mntner: SPENCERCW-MNT +admin-c: SPENCERCW-DN42 +tech-c: SPENCERCW-DN42 +mnt-by: SPENCERCW-MNT +auth: pgp-fingerprint CD75621FF859DA0D9D42AE3197C4DB0E2F3F804B +source: DN42 diff --git a/data/mntner/THEQ-MNT b/data/mntner/THEQ-MNT index 01c09a8b0..5b2c6af15 100644 --- a/data/mntner/THEQ-MNT +++ b/data/mntner/THEQ-MNT @@ -5,3 +5,4 @@ mnt-by: THEQ-MNT source: DN42 auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1ATGnz4OiDDcgjet5LZ8GvAmgI8OQc4kJ3uf3txaGl+HqZ0l8Da3YIc40S2J+lXLQqPhr40gfRWXo5BvYVyxDeNZi2nePiz+H/CjJdBH+kOKKqF+gJzuEXn7upx6Jwf0gXfSWQXBZu7V7SfE3Pn8U20bj1VJBeUBX42+aE+kj4dQY8p/O03WwEwsr4nJMR9J14j+ro+Mdp7/zr116z0AxJFDogaWmVeRDTTcZL4Z282ubmpXLT1PxGYUZH9IXjtNq2dc2uHWJPyuWmw4cIJocI9kAMCh2x1eDciNlsrZ6KpFgHftHNMcQfWa35R23S4ZtHBiy2aM8KdQhgSIN8xdJ auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmYJI5uLKE4xmL7xqu0ZDyCQA4DAnh4vWUL/1czljub4SDs/+EsgqbdPcRzXtIUs+/KKGjBwTklosYLw/jacU+wwxqYhwFFS3GR7ipX0Bpfl61vO5wzyJwpjnuVPHJ4gjJBJ7xc+URhxcf/u0wMJC7hRwglAe1OFeUi0yI2v+JOWS2ok2vVxcg65aaQf36JQw8RFLloDfPm4CfoxA1yP50v6ALqjmRcdgl7d62Rs7pUlncxQFqHikL0LN/6kjdJUWtStYgVJaK/ot5BjvFWiqB6g+3+ysa63kbMtzFWx6S46ghGcM7GoIAdRWic0rp0YhXfUhRFqeRe8gAQKov6/Ql +auth: pgp-fingerprint 7463D7FCAC8A3FB7D71B1EDC7A124C89A5B3533E diff --git a/data/mntner/TRACE-MNT b/data/mntner/TRACE-MNT new file mode 100644 index 000000000..992f3c420 --- /dev/null +++ b/data/mntner/TRACE-MNT @@ -0,0 +1,7 @@ +mntner: TRACE-MNT +descr: TRACE maintainer +admin-c: TRACE-DN42 +tech-c: TRACE-DN42 +auth: pgp-fingerprint 763AAFEB568E6D99A9780EC5E20A46529E65F13C +mnt-by: TRACE-MNT +source: DN42 diff --git a/data/mntner/TRUEWINTER-MNT b/data/mntner/TRUEWINTER-MNT new file mode 100644 index 000000000..980a8dbd1 --- /dev/null +++ b/data/mntner/TRUEWINTER-MNT @@ -0,0 +1,6 @@ +mntner: TRUEWINTER-MNT +admin-c: TRUEWINTER-DN42 +tech-c: TRUEWINTER-DN42 +mnt-by: TRUEWINTER-MNT +auth: pgp-fingerprint C9B6FE1D67F14A0F0170B6BD5B416A7CC6CD7973 +source: DN42 diff --git a/data/mntner/YI-MNT b/data/mntner/YI-MNT index 544590ce4..21d903a97 100644 --- a/data/mntner/YI-MNT +++ b/data/mntner/YI-MNT @@ -3,5 +3,5 @@ descr: YI admin-c: YI-DN42 tech-c: YI-DN42 mnt-by: YI-MNT -auth: pgp-fingerprint 8494AEA47C7F0DD115D5F380214B9E43D3535759 +auth: pgp-fingerprint 427F0DFE90E2AE146C1740C1DC0FD24FF11880AF source: DN42 diff --git a/data/organisation/ORG-ERINN b/data/organisation/ORG-ERINN new file mode 100644 index 000000000..185d6b1d6 --- /dev/null +++ b/data/organisation/ORG-ERINN @@ -0,0 +1,8 @@ +organisation: ORG-ERINN +org-name: Erinn Network +admin-c: ERINN-DN42 +tech-c: ERINN-DN42 +mnt-by: ERINN-MNT +e-mail: ErinnNetwork@riseup.net +abuse-mailbox: ErinnNetwork+Abuse@riseup.net +source: DN42 diff --git a/data/organisation/ORG-REDPANDANETWORK b/data/organisation/ORG-REDPANDANETWORK deleted file mode 100644 index fd792675c..000000000 --- a/data/organisation/ORG-REDPANDANETWORK +++ /dev/null @@ -1,6 +0,0 @@ -organisation: ORG-REDPANDANETWORK -org-name: Red Panda Network -admin-c: REDP-DN42 -tech-c: REDP-DN42 -mnt-by: REDPANDA-MNT -source: DN42 diff --git a/data/organisation/ORG-TKUHACKLAB b/data/organisation/ORG-TKUHACKLAB new file mode 100644 index 000000000..4278fb9f2 --- /dev/null +++ b/data/organisation/ORG-TKUHACKLAB @@ -0,0 +1,7 @@ +organisation: ORG-TKUHACKLAB +org-name: Turku HackLab Ry +remarks: Check our website at turku.hacklab.fi. +admin-c: ORG-TKUHACKLAB-TECH-DN42 +tech-c: ORG-TKUHACKLAB-TECH-DN42 +mnt-by: SM-MNT +source: DN42 diff --git a/data/person/AVE-DN42 b/data/person/AVE-DN42 new file mode 100644 index 000000000..ed3ad1b99 --- /dev/null +++ b/data/person/AVE-DN42 @@ -0,0 +1,9 @@ +person: Ave +e-mail: dn42@ave.zone +contact: irc:ave_@freenode +contact: irc:ave@hackint +contact: twitter:warnvod +contact: xmpp:a@a3.pm +nic-hdl: AVE-DN42 +mnt-by: AVE-MNT +source: DN42 diff --git a/data/person/ENP2S0-DN42 b/data/person/ENP2S0-DN42 new file mode 100644 index 000000000..337df88e7 --- /dev/null +++ b/data/person/ENP2S0-DN42 @@ -0,0 +1,7 @@ +person: enp2s0 +contact: noahb2713@gmail.com +www: www.enp2s0.xyz +pgp-fingerprint: C6C8E4808F04EBEAF773970299244FB9C0E86ED0 +nic-hdl: ENP2S0-DN42 +mnt-by: ENP2S0-MNT +source: DN42 diff --git a/data/person/ERINN-DN42 b/data/person/ERINN-DN42 new file mode 100644 index 000000000..b5bd649c4 --- /dev/null +++ b/data/person/ERINN-DN42 @@ -0,0 +1,5 @@ +person: Cronfox +e-mail: ErinnNetwork@riseup.net +nic-hdl: ERINN-DN42 +mnt-by: ERINN-MNT +source: DN42 diff --git a/data/person/FL-DN42 b/data/person/FL-DN42 new file mode 100644 index 000000000..f79579ef4 --- /dev/null +++ b/data/person/FL-DN42 @@ -0,0 +1,6 @@ +person: fl +contact: irc:fl @ hackint.org +e-mail: fl@mp.ls +nic-hdl: FL-DN42 +mnt-by: FL-MNT +source: DN42 diff --git a/data/person/HONDA-DN42 b/data/person/HONDA-DN42 new file mode 100644 index 000000000..dca5ad83c --- /dev/null +++ b/data/person/HONDA-DN42 @@ -0,0 +1,5 @@ +person: Honda Chen +e-mail: hondachen9@gmail.com +nic-hdl: HONDA-DN42 +mnt-by: HONDA-MNT +source: DN42 \ No newline at end of file diff --git a/data/person/INL-DN42 b/data/person/INL-DN42 new file mode 100644 index 000000000..a3b925b51 --- /dev/null +++ b/data/person/INL-DN42 @@ -0,0 +1,5 @@ +person: Daniel Law +contact: mail:daniel@inl.in.th +nic-hdl: INL-DN42 +mnt-by: INL-MNT +source: DN42 diff --git a/data/person/KANKAN-DN42 b/data/person/KANKAN-DN42 index 7bb4b4211..0508cb49d 100644 --- a/data/person/KANKAN-DN42 +++ b/data/person/KANKAN-DN42 @@ -1,7 +1,5 @@ person: kankan e-mail: dn42@chiantos.org -contact: irc:kankan@geeknode -contact: twitter:kankan_01 nic-hdl: KANKAN-DN42 mnt-by: KANKAN-MNT source: DN42 diff --git a/data/person/L4RS-DN42 b/data/person/L4RS-DN42 new file mode 100644 index 000000000..7fc70dc0c --- /dev/null +++ b/data/person/L4RS-DN42 @@ -0,0 +1,5 @@ +person: L4rs +e-mail: dn42@l4rs.net +nic-hdl: L4RS-DN42 +mnt-by: L4RS-MNT +source: DN42 diff --git a/data/person/LEAH2-DN42 b/data/person/LEAH2-DN42 new file mode 100644 index 000000000..d9c04da07 --- /dev/null +++ b/data/person/LEAH2-DN42 @@ -0,0 +1,7 @@ +person: Leah Neukirchen +e-mail: leah@vuxu.org +contact: irc:leah2@hackint +contact: irc:leah2@freenode +nic-hdl: LEAH2-DN42 +mnt-by: LEAH2-MNT +source: DN42 diff --git a/data/person/LINUXGEMINI-DN42 b/data/person/LINUXGEMINI-DN42 index 6fe79ca06..588883cd8 100644 --- a/data/person/LINUXGEMINI-DN42 +++ b/data/person/LINUXGEMINI-DN42 @@ -1,5 +1,9 @@ person: linuxgemini e-mail: ilteris@asenkron.com.tr +contact: twitter:linuxgemini +contact: xmpp:linuxgemini@a3.pm +contact: irc:linuxgemini@hackint +contact: irc:linuxgemini@freenode nic-hdl: LINUXGEMINI-DN42 mnt-by: LINUXGEMINI-MNT source: DN42 diff --git a/data/person/PATERNOT-DN42 b/data/person/PATERNOT-DN42 new file mode 100644 index 000000000..9bfe9d9d8 --- /dev/null +++ b/data/person/PATERNOT-DN42 @@ -0,0 +1,5 @@ +person: PATERNOT +contact: dn42@shiva.eti.br +nic-hdl: PATERNOT-DN42 +mnt-by: PATERNOT-MNT +source: DN42 diff --git a/data/person/PIGGY-DN42 b/data/person/PIGGY-DN42 new file mode 100644 index 000000000..503d164af --- /dev/null +++ b/data/person/PIGGY-DN42 @@ -0,0 +1,8 @@ +person: PiggyMoe +contact: me@piggy.moe +contact: telegram:@piggymoe +contact: github:@piggymoe +nic-hdl: PIGGY-DN42 +mnt-by: PIGGY-MNT +pgp-fingerprint: 2AF061CA67AB9E63254A552193A2530ACDB33DE7 +source: DN42 diff --git a/data/person/RAITO-DN42 b/data/person/RAITO-DN42 new file mode 100644 index 000000000..9be971af3 --- /dev/null +++ b/data/person/RAITO-DN42 @@ -0,0 +1,5 @@ +person: Raito Bezarius +contact: dn42@lahfa.xyz +nic-hdl: RAITO-DN42 +mnt-by: RAITO-MNT +source: DN42 diff --git a/data/person/REDP-DN42 b/data/person/REDP-DN42 deleted file mode 100644 index 159ce6ef4..000000000 --- a/data/person/REDP-DN42 +++ /dev/null @@ -1,8 +0,0 @@ -person: Tyrasuki -remarks: Tyrasuki's PERSON object -contact: telegram: @Tyrasuki -contact: twitter: @Tyrasuki -e-mail: dn42@tyrasuki.be -nic-hdl: REDP-DN42 -mnt-by: REDPANDA-MNT -source: DN42 diff --git a/data/person/RVALUE-DN42 b/data/person/RVALUE-DN42 new file mode 100644 index 000000000..269b13413 --- /dev/null +++ b/data/person/RVALUE-DN42 @@ -0,0 +1,7 @@ +person: rvalue +contact: rvalue@qq.com +contact: rvaluemoe@gmail.com +contact: telegram:@rvalue_official +nic-hdl: RVALUE-DN42 +mnt-by: RVALUE-MNT +source: DN42 diff --git a/data/person/SHYPRE-DN42 b/data/person/SHYPRE-DN42 new file mode 100644 index 000000000..873a827a8 --- /dev/null +++ b/data/person/SHYPRE-DN42 @@ -0,0 +1,5 @@ +person: Michael Lin +contact: shyprea2@gmail.com +nic-hdl: SHYPRE-DN42 +mnt-by: SHYPRE-MNT +source: DN42 diff --git a/data/person/SPENCERCW-DN42 b/data/person/SPENCERCW-DN42 new file mode 100644 index 000000000..9d7b1c538 --- /dev/null +++ b/data/person/SPENCERCW-DN42 @@ -0,0 +1,5 @@ +person: spencercw +e-mail: dn42@cwspencer.co.uk +nic-hdl: SPENCERCW-DN42 +mnt-by: SPENCERCW-MNT +source: DN42 diff --git a/data/person/TRACE-DN42 b/data/person/TRACE-DN42 new file mode 100644 index 000000000..7ccda3143 --- /dev/null +++ b/data/person/TRACE-DN42 @@ -0,0 +1,5 @@ +person: TRACE WU +contact: noc@trace166.yiy.tw +nic-hdl: TRACE-DN42 +mnt-by: TRACE-MNT +source: DN42 diff --git a/data/person/TRUEWINTER-DN42 b/data/person/TRUEWINTER-DN42 new file mode 100644 index 000000000..c69110629 --- /dev/null +++ b/data/person/TRUEWINTER-DN42 @@ -0,0 +1,7 @@ +person: Nicholis du Toit +e-mail: dn42@truewinter.dev +contact: twitter:TrueWinter1 +pgp-fingerprint: C9B6FE1D67F14A0F0170B6BD5B416A7CC6CD7973 +nic-hdl: TRUEWINTER-DN42 +mnt-by: TRUEWINTER-MNT +source: DN42 diff --git a/data/person/YI-DN42 b/data/person/YI-DN42 index cfea6755b..c7ddeb7cc 100644 --- a/data/person/YI-DN42 +++ b/data/person/YI-DN42 @@ -1,5 +1,5 @@ person: YI -contact: noc-dns42@yiy.tw +contact: jackcooku@steveyi.net nic-hdl: YI-DN42 mnt-by: YI-MNT source: DN42 diff --git a/data/role/ORG-TKUHACKLAB-TECH-DN42 b/data/role/ORG-TKUHACKLAB-TECH-DN42 new file mode 100644 index 000000000..cae440ebc --- /dev/null +++ b/data/role/ORG-TKUHACKLAB-TECH-DN42 @@ -0,0 +1,7 @@ +role: ORG-TKUHACKLAB-TECH-DN42 +nic-hdl: ORG-TKUHACKLAB-TECH-DN42 +mnt-by: SM-MNT +org: ORG-TKUHACKLAB +tech-c: SM-DN42 +remarks: email: hacklabturku@gmail.com +source: DN42 diff --git a/data/route/172.20.139.176_28 b/data/route/172.20.139.176_28 new file mode 100644 index 000000000..8b6f6be22 --- /dev/null +++ b/data/route/172.20.139.176_28 @@ -0,0 +1,4 @@ +route: 172.20.139.176/28 +origin: AS4242421273 +mnt-by: SPENCERCW-MNT +source: DN42 diff --git a/data/route/172.20.160.48_28 b/data/route/172.20.160.48_28 new file mode 100644 index 000000000..7c25034fb --- /dev/null +++ b/data/route/172.20.160.48_28 @@ -0,0 +1,4 @@ +route: 172.20.160.48/28 +origin: AS4242421155 +mnt-by: L4RS-MNT +source: DN42 diff --git a/data/route/172.20.192.96_27 b/data/route/172.20.192.96_27 new file mode 100644 index 000000000..7ef003209 --- /dev/null +++ b/data/route/172.20.192.96_27 @@ -0,0 +1,4 @@ +route: 172.20.192.96/27 +origin: AS4242422492 +mnt-by: INL-MNT +source: DN42 diff --git a/data/route/172.20.207.192_27 b/data/route/172.20.207.192_27 new file mode 100644 index 000000000..18a9d7eb0 --- /dev/null +++ b/data/route/172.20.207.192_27 @@ -0,0 +1,4 @@ +route: 172.20.207.192/27 +origin: AS4242420737 +mnt-by: TRUEWINTER-MNT +source: DN42 diff --git a/data/route/172.20.236.64_29 b/data/route/172.20.236.64_29 new file mode 100644 index 000000000..677c8bdcd --- /dev/null +++ b/data/route/172.20.236.64_29 @@ -0,0 +1,4 @@ +route: 172.20.236.64/29 +origin: AS4242422466 +mnt-by: SHYPRE-MNT +source: DN42 diff --git a/data/route/172.21.105.144_28 b/data/route/172.21.105.144_28 new file mode 100644 index 000000000..ee88efd9b --- /dev/null +++ b/data/route/172.21.105.144_28 @@ -0,0 +1,5 @@ +route: 172.21.105.144/28 +descr: Route for KOISHI-AS +origin: AS4242420514 +mnt-by: RVALUE-MNT +source: DN42 diff --git a/data/route/172.21.117.32_27 b/data/route/172.21.117.32_27 new file mode 100644 index 000000000..353ac41f6 --- /dev/null +++ b/data/route/172.21.117.32_27 @@ -0,0 +1,4 @@ +route: 172.21.117.32/27 +origin: AS4242422705 +mnt-by: PIGGY-MNT +source: DN42 diff --git a/data/route/172.21.66.224_27 b/data/route/172.21.66.224_27 new file mode 100644 index 000000000..9ec69e3da --- /dev/null +++ b/data/route/172.21.66.224_27 @@ -0,0 +1,5 @@ +route: 172.21.66.224/27 +descr: TRACE.NETWORK +origin: AS4242421165 +mnt-by: TRACE-MNT +source: DN42 diff --git a/data/route/172.21.89.128_26 b/data/route/172.21.89.128_26 new file mode 100644 index 000000000..512f96f9a --- /dev/null +++ b/data/route/172.21.89.128_26 @@ -0,0 +1,4 @@ +route: 172.21.89.128/26 +origin: AS4242423953 +mnt-by: ERINN-MNT +source: DN42 diff --git a/data/route/172.22.105.64_27 b/data/route/172.22.105.64_27 new file mode 100644 index 000000000..74cb06dfd --- /dev/null +++ b/data/route/172.22.105.64_27 @@ -0,0 +1,4 @@ +route: 172.22.105.64/27 +origin: AS4242421975 +mnt-by: FL-MNT +source: DN42 diff --git a/data/route/172.22.122.160_27 b/data/route/172.22.122.160_27 new file mode 100644 index 000000000..5072ccc85 --- /dev/null +++ b/data/route/172.22.122.160_27 @@ -0,0 +1,4 @@ +route: 172.22.122.160/27 +origin: AS4242420669 +mnt-by: AVE-MNT +source: DN42 diff --git a/data/route/172.22.137.32_27 b/data/route/172.22.137.32_27 index 44387c4d5..17f5517e8 100644 --- a/data/route/172.22.137.32_27 +++ b/data/route/172.22.137.32_27 @@ -1,5 +1,5 @@ route: 172.22.137.32/27 -origin: AS424242236 +origin: AS4242422647 mnt-by: POMOKE-MNT descr: pomoke Network - inet source: DN42 diff --git a/data/route/172.22.177.0_27 b/data/route/172.22.177.0_27 deleted file mode 100644 index 73fc7a355..000000000 --- a/data/route/172.22.177.0_27 +++ /dev/null @@ -1,4 +0,0 @@ -route: 172.22.177.0/27 -origin: AS49752 -mnt-by: REDPANDA-MNT -source: DN42 diff --git a/data/route/172.22.189.104_29 b/data/route/172.22.189.104_29 new file mode 100644 index 000000000..562c81e8b --- /dev/null +++ b/data/route/172.22.189.104_29 @@ -0,0 +1,5 @@ +route: 172.22.189.104/29 +origin: AS209557 +origin: AS4242421214 +mnt-by: YI-MNT +source: DN42 diff --git a/data/route/172.22.189.112_29 b/data/route/172.22.189.112_29 new file mode 100644 index 000000000..bc69b7354 --- /dev/null +++ b/data/route/172.22.189.112_29 @@ -0,0 +1,6 @@ +route: 172.22.189.112/29 +origin: AS209557 +origin: AS4242420507 +mnt-by: YI-MNT +mnt-by: HONDA-MNT +source: DN42 diff --git a/data/route/172.22.189.120_29 b/data/route/172.22.189.120_29 new file mode 100644 index 000000000..268049390 --- /dev/null +++ b/data/route/172.22.189.120_29 @@ -0,0 +1,5 @@ +route: 172.22.189.120/29 +origin: AS209557 +origin: AS4242421214 +mnt-by: YI-MNT +source: DN42 diff --git a/data/route/172.22.189.96_27 b/data/route/172.22.189.96_29 similarity index 56% rename from data/route/172.22.189.96_27 rename to data/route/172.22.189.96_29 index a44f82e68..e8d80bfe2 100644 --- a/data/route/172.22.189.96_27 +++ b/data/route/172.22.189.96_29 @@ -1,4 +1,5 @@ -route: 172.22.189.96/27 +route: 172.22.189.96/29 +origin: AS209557 origin: AS4242421214 mnt-by: YI-MNT source: DN42 diff --git a/data/route/172.23.147.0_24 b/data/route/172.23.147.0_24 new file mode 100644 index 000000000..f1be1d130 --- /dev/null +++ b/data/route/172.23.147.0_24 @@ -0,0 +1,5 @@ +route: 172.23.147.0/24 +origin: AS64742 +mnt-by: KANKAN-MNT +pingable: 172.23.147.1 +source: DN42 diff --git a/data/route6/fd02:685f:edac::_48 b/data/route6/fd02:685f:edac::_48 deleted file mode 100644 index cdb61aff1..000000000 --- a/data/route6/fd02:685f:edac::_48 +++ /dev/null @@ -1,5 +0,0 @@ -route6: fd02:685f:edac::/48 -origin: AS49752 -max-length: 64 -mnt-by: REDPANDA-MNT -source: DN42 diff --git a/data/route6/fd0a:cdb3:cde7::_48 b/data/route6/fd0a:cdb3:cde7::_48 new file mode 100644 index 000000000..47ef690c8 --- /dev/null +++ b/data/route6/fd0a:cdb3:cde7::_48 @@ -0,0 +1,4 @@ +route6: fd0a:cdb3:cde7::/48 +origin: AS4242422705 +mnt-by: PIGGY-MNT +source: DN42 diff --git a/data/route6/fd0b:10c0:9966::_48 b/data/route6/fd0b:10c0:9966::_48 new file mode 100644 index 000000000..41b96c16a --- /dev/null +++ b/data/route6/fd0b:10c0:9966::_48 @@ -0,0 +1,5 @@ +route6: fd0b:10c0:9966::/48 +descr: HONDA iPv6 +origin: AS4242420506 +mnt-by: HONDA-MNT +source: DN42 diff --git a/data/route6/fd22:ad17:8e8d::_48 b/data/route6/fd22:ad17:8e8d::_48 new file mode 100644 index 000000000..9e8514f48 --- /dev/null +++ b/data/route6/fd22:ad17:8e8d::_48 @@ -0,0 +1,5 @@ +route6: fd22:ad17:8e8d::/48 +origin: AS4242423073 +max-length: 52 +mnt-by: PATERNOT-MNT +source: DN42 diff --git a/data/route6/fd39:e07d:e463::_48 b/data/route6/fd39:e07d:e463::_48 new file mode 100644 index 000000000..3e1afba5f --- /dev/null +++ b/data/route6/fd39:e07d:e463::_48 @@ -0,0 +1,4 @@ +route6: fd39:e07d:e463::/48 +origin: AS4242421165 +mnt-by: TRACE-MNT +source: DN42 diff --git a/data/route6/fd40:2200:1975::_48 b/data/route6/fd40:2200:1975::_48 new file mode 100644 index 000000000..29363f0e3 --- /dev/null +++ b/data/route6/fd40:2200:1975::_48 @@ -0,0 +1,5 @@ +route6: fd40:2200:1975::/48 +origin: AS4242421975 +max-length: 48 +mnt-by: FL-MNT +source: DN42 diff --git a/data/route6/fd42:6176:65::_48 b/data/route6/fd42:6176:65::_48 new file mode 100644 index 000000000..86abb1a2f --- /dev/null +++ b/data/route6/fd42:6176:65::_48 @@ -0,0 +1,5 @@ +route6: fd42:6176:65::/48 +origin: AS4242420669 +max-length: 48 +mnt-by: AVE-MNT +source: DN42 diff --git a/data/route6/fd49:5b5:b737::_48 b/data/route6/fd49:5b5:b737::_48 new file mode 100644 index 000000000..f6dc8b7e7 --- /dev/null +++ b/data/route6/fd49:5b5:b737::_48 @@ -0,0 +1,5 @@ +route6: fd49:5b5:b737::/48 +origin: AS4242420737 +max-length: 48 +mnt-by: TRUEWINTER-MNT +source: DN42 diff --git a/data/route6/fd4d:ce73:68f9::_48 b/data/route6/fd4d:ce73:68f9::_48 new file mode 100644 index 000000000..e8df474c8 --- /dev/null +++ b/data/route6/fd4d:ce73:68f9::_48 @@ -0,0 +1,5 @@ +route6: fd4d:ce73:68f9::/48 +origin: AS4242421457 +max-length: 48 +mnt-by: RAITO-MNT +source: DN42 diff --git a/data/route6/fd4f:4e49:4f4e::_48 b/data/route6/fd4f:4e49:4f4e::_48 new file mode 100644 index 000000000..bbd43530d --- /dev/null +++ b/data/route6/fd4f:4e49:4f4e::_48 @@ -0,0 +1,5 @@ +route6: fd4f:4e49:4f4e::/48 +origin: AS4242423847 +max-length: 48 +mnt-by: THEQ-MNT +source: DN42 \ No newline at end of file diff --git a/data/route6/fd69:9889:9692::_48 b/data/route6/fd69:9889:9692::_48 index d073663b9..dd3a5f6cf 100644 --- a/data/route6/fd69:9889:9692::_48 +++ b/data/route6/fd69:9889:9692::_48 @@ -1,4 +1,5 @@ route6: fd69:9889:9692::/48 +origin: AS209557 origin: AS4242421214 mnt-by: YI-MNT source: DN42 diff --git a/data/route6/fd6e:cab2:576b::_48 b/data/route6/fd6e:cab2:576b::_48 new file mode 100644 index 000000000..f8ece1aef --- /dev/null +++ b/data/route6/fd6e:cab2:576b::_48 @@ -0,0 +1,5 @@ +route6: fd6e:cab2:576b::/48 +origin: AS4242421155 +max-length: 48 +mnt-by: L4RS-MNT +source: DN42 diff --git a/data/route6/fd6f:6e69:6f6e::_48 b/data/route6/fd6f:6e69:6f6e::_48 new file mode 100644 index 000000000..9f5fa31a7 --- /dev/null +++ b/data/route6/fd6f:6e69:6f6e::_48 @@ -0,0 +1,5 @@ +route6: fd6f:6e69:6f6e::/48 +origin: AS4242423847 +max-length: 48 +mnt-by: THEQ-MNT +source: DN42 \ No newline at end of file diff --git a/data/route6/fd7e:7e3e:71be::_48 b/data/route6/fd7e:7e3e:71be::_48 new file mode 100644 index 000000000..27dbbb8cc --- /dev/null +++ b/data/route6/fd7e:7e3e:71be::_48 @@ -0,0 +1,4 @@ +route6: fd7e:7e3e:71be::/48 +origin: AS4242422492 +mnt-by: INL-MNT +source: DN42 diff --git a/data/route6/fd86:5946:61b2::_48 b/data/route6/fd86:5946:61b2::_48 new file mode 100644 index 000000000..1a1f8950e --- /dev/null +++ b/data/route6/fd86:5946:61b2::_48 @@ -0,0 +1,5 @@ +route6: fd86:5946:61b2::/48 +origin: AS4242421273 +max-length: 48 +mnt-by: SPENCERCW-MNT +source: DN42 diff --git a/data/route6/fd8e:6470:7a23::_48 b/data/route6/fd8e:6470:7a23::_48 new file mode 100644 index 000000000..73d0b86f2 --- /dev/null +++ b/data/route6/fd8e:6470:7a23::_48 @@ -0,0 +1,8 @@ +route6: fd8e:6470:7a23::/48 +origin: AS64742 +admin-c: KANKAN-DN42 +tech-c: KANKAN-DN42 +max-length: 48 +pingable: fd8e:6470:7a23:100::9 +mnt-by: KANKAN-MNT +source: DN42 diff --git a/data/route6/fd98:de34:62e8::_48 b/data/route6/fd98:de34:62e8::_48 index ec8ed2db7..f457595ed 100644 --- a/data/route6/fd98:de34:62e8::_48 +++ b/data/route6/fd98:de34:62e8::_48 @@ -1,5 +1,5 @@ route6: fd98:de34:62e8::/48 -origin: AS424242236 +origin: AS4242422647 descr: pomoke Network - inet6 max-length: 48 mnt-by: POMOKE-MNT diff --git a/data/route6/fdc2:1708:72bc::_48 b/data/route6/fdc2:1708:72bc::_48 new file mode 100644 index 000000000..9dc5d9176 --- /dev/null +++ b/data/route6/fdc2:1708:72bc::_48 @@ -0,0 +1,4 @@ +route6: fdc2:1708:72bc::/48 +origin: AS4242422713 +mnt-by: ENP2S0-MNT +source: DN42 diff --git a/data/route6/fdfb:42d3:9346::_48 b/data/route6/fdfb:42d3:9346::_48 new file mode 100644 index 000000000..430f139d9 --- /dev/null +++ b/data/route6/fdfb:42d3:9346::_48 @@ -0,0 +1,5 @@ +route6: fdfb:42d3:9346::/48 +origin: AS4242421608 +max-length: 48 +mnt-by: LEAH2-MNT +source: DN42 diff --git a/data/route6/fdfd:468b:bab6::_48 b/data/route6/fdfd:468b:bab6::_48 new file mode 100644 index 000000000..ab6c190ec --- /dev/null +++ b/data/route6/fdfd:468b:bab6::_48 @@ -0,0 +1,5 @@ +route6: fdfd:468b:bab6::/48 +origin: AS4242423953 +max-length: 48 +mnt-by: ERINN-MNT +source: DN42 diff --git a/data/route6/fdfd:df:5b67::_48 b/data/route6/fdfd:df:5b67::_48 new file mode 100644 index 000000000..b39f1e0f1 --- /dev/null +++ b/data/route6/fdfd:df:5b67::_48 @@ -0,0 +1,5 @@ +route6: fdfd:df:5b67::/48 +origin: AS4242423347 +max-length: 56 +mnt-by: SM-MNT +source: DN42 diff --git a/data/route6/fdfe:bf34:baaa::_48 b/data/route6/fdfe:bf34:baaa::_48 new file mode 100644 index 000000000..2cdef6fc4 --- /dev/null +++ b/data/route6/fdfe:bf34:baaa::_48 @@ -0,0 +1,5 @@ +route6: fdfe:bf34:baaa::/48 +descr: Route for KOISHI-AS +origin: AS4242420514 +mnt-by: RVALUE-MNT +source: DN42 diff --git a/squash-my-commits b/squash-my-commits new file mode 100755 index 000000000..79f91d865 --- /dev/null +++ b/squash-my-commits @@ -0,0 +1,160 @@ +#!/bin/sh +########################################################################## +# +# This script will automatically bring the local git branch up to date +# with any changes in the main registry repository and will then squash +# the local changes together in to a single commit +# +# use './squash-my-commits -S' to sign the result with your pgp key +# +########################################################################## + +usage() +{ + echo "Usage: $0 [options]" + echo 'Options:' + echo ' -S, sign the result with your pgp key' + echo ' --push, force push result' + echo ' --ssh, use ssh to fetch from the registry' + echo ' --https, use https to fetch from the registry' + echo 'Environment variables:' + echo ' DN42_REG_URL, set the registry URL to use' +} + +########################################################################## +# parse arguments + +for arg +do + case "$arg" in + + -S) + do_sign='-S' + ;; + --push) + do_push=1 + ;; + --ssh) + echo 'Forcing use of SSH to fetch from registry' + reg_proto="ssh" + ;; + --https) + echo 'Forcing use of HTTPS to fetch from registry' + reg_proto="https" + ;; + --help) + usage + exit 0 + ;; + *) + echo "Unknown option: $arg" + usage + exit 1 + ;; + + esac +done + +########################################################################## + +# check for dn42registry remote, and add if missing +git remote -v | grep dn42registry > /dev/null 2>&1 +if [ "$?" -ne 0 ] +then + + # was the URL specified directly ? + if [ -n "$DN42_REG_URL" ] + then + reg="$DN42_REG_URL" + else + + if [ -z "$reg_proto" ] + then + # if the proto wasn't forced, try to guess it + git remote -v | grep 'https' > /dev/null 2>&1 + if [ $? -eq 0 ] + then + reg_proto='https' + else + reg_proto='ssh' + fi + fi + + case "$reg_proto" in + ssh) + reg='git@git.dn42.dev:dn42/registry.git' + ;; + https) + reg='https://git.dn42.dev/dn42/registry.git' + ;; + *) + echo 'ERROR: Unknown registry protocol' + exit 1 + ;; + esac + fi + + echo "Adding dn42registry remote: $reg" + git remote add dn42registry "$reg" +fi + +########################################################################## + +# ensure the local branch is up to date +echo 'Rebasing local changes against the registry master' +git fetch dn42registry master +if [ $? -ne 0 ] +then + echo 'ERROR: Failed to fetch registry master branch' + echo 'Hint: you can use --ssh/--https to force use of ssh or https' + echo 'If all else fails, you can also set the DN42_REG_URL' + echo 'environment variable to directly specify the URL to fetch' + exit 1 +fi + +# fail on errors from here onwards +set -e + +git rebase dn42registry/master + +########################################################################## + +# find number of local commits +count=$(git rev-list --count HEAD ^dn42registry/master) + +# if there are less then 2 local commits, there's nothing to do +if [ "$count" -lt 2 ] +then + echo "$count local commits found, no squash is required" + exit 0 +fi + +echo 'Squashing $count commits ...' + +# construct a new comment based on previous commits +comment="squashed commit: + +$(git log --oneline HEAD ^dn42registry/master)" + +# and finally squash +git reset --soft dn42registry/master +git commit $do_sign -m "$comment" + +# show what happened +echo '---' +git log -n 1 --show-signature +echo '---' + +########################################################################## + +# push changes if requested +if [ "$do_push" -eq 1 ] +then + echo 'Force pushing changes' + git push --force +else + echo 'Remember to push your changes using: git push --force' +fi + +########################################################################## +# end of file