From c46024767dbb9d1286942fc7088cfa1dd2739a33 Mon Sep 17 00:00:00 2001 From: David Zhixu Liu Date: Sat, 21 Aug 2021 11:06:25 +0800 Subject: [PATCH] AS4201270021: various changes Signed-off-by: David Zhixu Liu --- asn/AS17830.toml | 4 ++++ asn/AS211876.toml | 2 +- asn/AS4201270021.toml | 5 ++--- asn/AS4242421876.toml | 4 ++-- dns/db.10.127 | 7 ++++--- dns/db.fd10.127 | 7 ++++--- dns/neonetwork | 30 ++++++++++++++++++------------ entity/David Liu.toml | 2 +- node/PotatoNet.toml | 3 +++ node/fixmix.toml | 2 -- route/AS17830.toml | 9 +++++++++ route/AS211876.toml | 8 ++++---- route/AS4201270021.toml | 8 ++++---- route/AS4242421876.toml | 8 ++++---- 14 files changed, 60 insertions(+), 39 deletions(-) create mode 100644 asn/AS17830.toml create mode 100644 node/PotatoNet.toml delete mode 100644 node/fixmix.toml create mode 100644 route/AS17830.toml diff --git a/asn/AS17830.toml b/asn/AS17830.toml new file mode 100644 index 0000000..711816b --- /dev/null +++ b/asn/AS17830.toml @@ -0,0 +1,4 @@ +name = "POTATO-AS-AP" +owner = "David Liu" +description = "David Liu aka PotatoNet" +source = "Internet" diff --git a/asn/AS211876.toml b/asn/AS211876.toml index 90836c3..21fafd4 100644 --- a/asn/AS211876.toml +++ b/asn/AS211876.toml @@ -1,4 +1,4 @@ name = "FIXMIX-GEN" owner = "David Liu" -description = "fixmix Global Experimental Network" +description = "fixmix Technologies" source = "Internet" diff --git a/asn/AS4201270021.toml b/asn/AS4201270021.toml index 484de5d..ee630cb 100644 --- a/asn/AS4201270021.toml +++ b/asn/AS4201270021.toml @@ -1,4 +1,3 @@ -name = "FIXMIX-NEO" +name = "POTATO-NEO" owner = "David Liu" -description = "fixmix NeoNetwork Network" - +description = "PotatoNet @ NeoNetwork" diff --git a/asn/AS4242421876.toml b/asn/AS4242421876.toml index 960652c..4c57364 100644 --- a/asn/AS4242421876.toml +++ b/asn/AS4242421876.toml @@ -1,3 +1,3 @@ -name = "FIXMIX-42" +name = "POTATO-42" owner = "David Liu" -description = "fixmix DN42 Network" +description = "PotatoNet @ DN42" diff --git a/dns/db.10.127 b/dns/db.10.127 index 6a59598..ef7232f 100644 --- a/dns/db.10.127 +++ b/dns/db.10.127 @@ -92,9 +92,10 @@ $TTL 3600 127 IN NS ns1.yura.dn42. 127 IN NS ns2.yura.dn42. -66 IN NS ns1.fixmix.neo. -66 IN NS ns2.fixmix.neo. -66 IN NS ns3.fixmix.neo. +66 IN NS ns1.potato.neo. +66 IN NS ns2.potato.neo. +66 IN NS ns3.potato.neo. +66 IN DS 2356 7 2 46A410B6D465D60D2AEBE80135E7F7374CDA51F70AFEEA43445203509B118E66 99 IN NS ns1.tsingyao.neo. 99 IN NS ns2.tsingyao.neo. diff --git a/dns/db.fd10.127 b/dns/db.fd10.127 index d070010..87cb96c 100644 --- a/dns/db.fd10.127 +++ b/dns/db.fd10.127 @@ -44,9 +44,10 @@ $TTL 3600 1.1.e.e IN NS ns1.sun.dn42. -6.6.a.a IN NS ns1.fixmix.neo. -6.6.a.a IN NS ns2.fixmix.neo. -6.6.a.a IN NS ns3.fixmix.neo. +6.6.a.a IN NS ns1.potato.neo. +6.6.a.a IN NS ns2.potato.neo. +6.6.a.a IN NS ns3.potato.neo. +6.6.a.a IN DS 31105 7 2 CA2C41EA47978F1728FE49778CDC2882AD2725E23081AE72F7D2ECE5FF95E20D 8.8.4.1 IN NS ns1.bear.neo. diff --git a/dns/neonetwork b/dns/neonetwork index c800aeb..2ced242 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -111,18 +111,24 @@ ns.yura IN AAAA fd10:127:127:53:: ns1.yura IN AAAA fd10:127:127:53a::1 ns2.yura IN AAAA fd10:127:127:53b::1 -fixmix IN NS ns1.fixmix -fixmix IN NS ns2.fixmix -fixmix IN NS ns3.fixmix -david IN NS ns1.fixmix -david IN NS ns2.fixmix -david IN NS ns3.fixmix -ns1.fixmix IN A 10.127.66.59 -ns2.fixmix IN A 10.127.66.54 -ns3.fixmix IN A 10.127.66.52 -ns1.fixmix IN AAAA fd10:127:aa66:11:: -ns2.fixmix IN AAAA fd10:127:aa66:21:: -ns3.fixmix IN AAAA fd10:127:aa66:31:: +potato IN NS ns1.potato +potato IN NS ns2.potato +potato IN NS ns3.potato +potato IN DS 6841 7 2 B02CE6960F3FFC54AAAEA4FA26F050D911A7049158B0B35350E74CC78F04E183 +fixmix IN NS ns1.potato +fixmix IN NS ns2.potato +fixmix IN NS ns3.potato +fixmix IN DS 5223 7 2 BF26524942A4FAFA08C0DDF71C2E56EDC3BC82EDBA8F86B0DF6070B378919840 +david IN NS ns1.potato +david IN NS ns2.potato +david IN NS ns3.potato +david IN DS 14533 7 2 914D786DACF1C5D2C953515A425FB4BA4D644D7DECA7B6B60BBC487323479039 +ns1.potato IN A 10.127.66.59 +ns2.potato IN A 10.127.66.54 +ns3.potato IN A 10.127.66.52 +ns1.potato IN AAAA fd10:127:aa66:1010::1 +ns2.potato IN AAAA fd10:127:aa66:2010::1 +ns3.potato IN AAAA fd10:127:aa66:3010::1 bear IN NS ns1.bear koala IN NS ns1.bear diff --git a/entity/David Liu.toml b/entity/David Liu.toml index 57460e3..137879d 100644 --- a/entity/David Liu.toml +++ b/entity/David Liu.toml @@ -9,4 +9,4 @@ mastodon = "@p0tat05@mas.to" github = "p0tat05" [persona] -pgp = "11BA9B106D0DF5E6A1C4BC180641F2177A5530C0" +pgp = "F69228A3DADECB2BFCEE6EB38EC04651740E765D" diff --git a/node/PotatoNet.toml b/node/PotatoNet.toml new file mode 100644 index 0000000..088a61d --- /dev/null +++ b/node/PotatoNet.toml @@ -0,0 +1,3 @@ +[PotatoNet] +asn = 4201270021 +description = "PotatoNet @ NeoNetwork" diff --git a/node/fixmix.toml b/node/fixmix.toml deleted file mode 100644 index dd2a9ce..0000000 --- a/node/fixmix.toml +++ /dev/null @@ -1,2 +0,0 @@ -[fixmix] -asn = 4201270021 diff --git a/route/AS17830.toml b/route/AS17830.toml new file mode 100644 index 0000000..9c2a90c --- /dev/null +++ b/route/AS17830.toml @@ -0,0 +1,9 @@ +["10.127.66.0/24"] +type = "subnet" +name = "POTATO-NEO-NET4-A" +description = "PotatoNet @ NeoNetwork" + +["fd10:127:aa66::/48"] +type = "subnet" +name = "POTATO-NEO-NET6-A" +description = "PotatoNet @ NeoNetwork" diff --git a/route/AS211876.toml b/route/AS211876.toml index 712ca56..9c2a90c 100644 --- a/route/AS211876.toml +++ b/route/AS211876.toml @@ -1,9 +1,9 @@ ["10.127.66.0/24"] type = "subnet" -name = "FIXMIX-NET4-NEOA" -description = "fixmix Technologies NeoNetwork IPv4 Block" +name = "POTATO-NEO-NET4-A" +description = "PotatoNet @ NeoNetwork" ["fd10:127:aa66::/48"] type = "subnet" -name = "FIXMIX-NET6-NEOA" -description = "fixmix Technologies NeoNetwork IPv6 Block" +name = "POTATO-NEO-NET6-A" +description = "PotatoNet @ NeoNetwork" diff --git a/route/AS4201270021.toml b/route/AS4201270021.toml index 712ca56..9c2a90c 100644 --- a/route/AS4201270021.toml +++ b/route/AS4201270021.toml @@ -1,9 +1,9 @@ ["10.127.66.0/24"] type = "subnet" -name = "FIXMIX-NET4-NEOA" -description = "fixmix Technologies NeoNetwork IPv4 Block" +name = "POTATO-NEO-NET4-A" +description = "PotatoNet @ NeoNetwork" ["fd10:127:aa66::/48"] type = "subnet" -name = "FIXMIX-NET6-NEOA" -description = "fixmix Technologies NeoNetwork IPv6 Block" +name = "POTATO-NEO-NET6-A" +description = "PotatoNet @ NeoNetwork" diff --git a/route/AS4242421876.toml b/route/AS4242421876.toml index 712ca56..9c2a90c 100644 --- a/route/AS4242421876.toml +++ b/route/AS4242421876.toml @@ -1,9 +1,9 @@ ["10.127.66.0/24"] type = "subnet" -name = "FIXMIX-NET4-NEOA" -description = "fixmix Technologies NeoNetwork IPv4 Block" +name = "POTATO-NEO-NET4-A" +description = "PotatoNet @ NeoNetwork" ["fd10:127:aa66::/48"] type = "subnet" -name = "FIXMIX-NET6-NEOA" -description = "fixmix Technologies NeoNetwork IPv6 Block" +name = "POTATO-NEO-NET6-A" +description = "PotatoNet @ NeoNetwork"