From 62a4f9b1125d08ad5bd95011aa59202d3bc0b1ad Mon Sep 17 00:00:00 2001 From: iEdon Date: Fri, 19 Feb 2021 22:17:32 +0800 Subject: [PATCH 1/7] Add new route record for new braches(super nodes) (#155) * Add new route for new braches(super nodes) * fix: Add new route for new braches(super nodes) * fix conflict --- dns/db.10.127 | 2 ++ dns/neonetwork | 3 +++ node/iEdon.toml | 2 -- route/AS4242422189.toml | 7 ++++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dns/db.10.127 b/dns/db.10.127 index 975a389..d883585 100644 --- a/dns/db.10.127 +++ b/dns/db.10.127 @@ -70,3 +70,5 @@ $TTL 604800 12 IN NS ns1.yangfl.dn42. 12 IN NS ns2.yangfl.dn42. + +21 IN NS ns.iedon.neo. diff --git a/dns/neonetwork b/dns/neonetwork index 7cd47ed..1e0fe2e 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -69,6 +69,9 @@ ns4.lantian IN AAAA fd10:127:10:2::1 ns5.lantian IN A 10.127.10.9 ns5.lantian IN AAAA fd10:127:10:9::1 +iedon IN NS ns.iedon +ns.iedon IN A 10.127.21.1 + staph IN NS ns1.staph staph IN NS ns2.staph staph IN DS 64592 13 2 1AF24492D8FAE84D99E05C9B9088DDB8A82003F3301A53F35EFEC1627BEADDBA diff --git a/node/iEdon.toml b/node/iEdon.toml index fa5992c..17503e2 100644 --- a/node/iEdon.toml +++ b/node/iEdon.toml @@ -1,4 +1,2 @@ [iEdon] asn = 4242422189 -description = "IEDON-NET" -cidr = ["10.127.21.1/24"] diff --git a/route/AS4242422189.toml b/route/AS4242422189.toml index 94f2897..f0b2fc4 100644 --- a/route/AS4242422189.toml +++ b/route/AS4242422189.toml @@ -1,4 +1,9 @@ ["10.127.21.0/24"] type = "subnet" name = "IEDON-NET" -description = "iEdon Networks - Access points" +description = "iEdon Networks - Backbone and branches" + +["10.127.25.0/24"] +type = "subnet" +name = "IEDON-NET" +description = "iEdon Networks - Backbone and branches" From 53721ef40c3427d37ef95617dcf911fedb765fc4 Mon Sep 17 00:00:00 2001 From: sunaihui <49404500+sunaihui@users.noreply.github.com> Date: Sat, 20 Feb 2021 14:14:40 +0800 Subject: [PATCH 2/7] Create AS38173.toml (#156) * Create AS38173.toml * Create AS38173.toml --- asn/AS38173.toml | 4 ++++ route/AS38173.toml | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 asn/AS38173.toml create mode 100644 route/AS38173.toml diff --git a/asn/AS38173.toml b/asn/AS38173.toml new file mode 100644 index 0000000..356ad6d --- /dev/null +++ b/asn/AS38173.toml @@ -0,0 +1,4 @@ +name = "SUNNET" +description = "SUNNET" +owner = "SUNNET" +source = "Internet" diff --git a/route/AS38173.toml b/route/AS38173.toml new file mode 100644 index 0000000..bef89ce --- /dev/null +++ b/route/AS38173.toml @@ -0,0 +1,8 @@ +["10.127.11.0/24"] +type = "subnet" +name = "SUNNET" +description = "SUNNET" +["fd10:127:ee11::/48"] +type = "subnet" +name = "SUNNET" +description = "SUNNET" From 929edcf532dfddcf6312f2b0f848e000ab02fe35 Mon Sep 17 00:00:00 2001 From: David Zhixu Liu Date: Tue, 23 Mar 2021 11:11:48 +0800 Subject: [PATCH 3/7] Add objects: entity, asn, route, node --- asn/AS211876.toml | 4 ++++ asn/AS4201270021.toml | 3 +++ asn/AS4242421876.toml | 3 +++ entity/DavidLiu.toml | 11 +++++++++++ node/DavidLiu.toml | 2 ++ route/AS211876.toml | 9 +++++++++ route/AS4201270021.toml | 9 +++++++++ route/AS4242421876.toml | 9 +++++++++ 8 files changed, 50 insertions(+) create mode 100644 asn/AS211876.toml create mode 100644 asn/AS4201270021.toml create mode 100644 asn/AS4242421876.toml create mode 100644 entity/DavidLiu.toml create mode 100644 node/DavidLiu.toml create mode 100644 route/AS211876.toml create mode 100644 route/AS4201270021.toml create mode 100644 route/AS4242421876.toml diff --git a/asn/AS211876.toml b/asn/AS211876.toml new file mode 100644 index 0000000..674c755 --- /dev/null +++ b/asn/AS211876.toml @@ -0,0 +1,4 @@ +name = "AS-FIXMIX" +owner = "DavidLiu" +description = "fixmix Global Experimental Network" +source = "Internet" diff --git a/asn/AS4201270021.toml b/asn/AS4201270021.toml new file mode 100644 index 0000000..d9353f2 --- /dev/null +++ b/asn/AS4201270021.toml @@ -0,0 +1,3 @@ +name = "AS-FIXMIX-NEONETWORK" +owner = "DavidLiu" +description = "fixmix NeoNetwork Network" diff --git a/asn/AS4242421876.toml b/asn/AS4242421876.toml new file mode 100644 index 0000000..2d68e6d --- /dev/null +++ b/asn/AS4242421876.toml @@ -0,0 +1,3 @@ +name = "AS-FIXMIX-DN42" +owner = "DavidLiu" +description = "fixmix DN42 Network" diff --git a/entity/DavidLiu.toml b/entity/DavidLiu.toml new file mode 100644 index 0000000..f7ba430 --- /dev/null +++ b/entity/DavidLiu.toml @@ -0,0 +1,11 @@ +name = "DavidLiu" +babel = ["zh-N", "en-3"] + +[contact] +email = "david@fixmix.tech" +telegram = "p0tat05" +irc = "p0tat05" +github = "p0tat05" + +[persona] +pgp = "11BA9B106D0DF5E6A1C4BC180641F2177A5530C0" diff --git a/node/DavidLiu.toml b/node/DavidLiu.toml new file mode 100644 index 0000000..dd2a9ce --- /dev/null +++ b/node/DavidLiu.toml @@ -0,0 +1,2 @@ +[fixmix] +asn = 4201270021 diff --git a/route/AS211876.toml b/route/AS211876.toml new file mode 100644 index 0000000..a70ecad --- /dev/null +++ b/route/AS211876.toml @@ -0,0 +1,9 @@ +["10.127.66.0/24"] +type = "subnet" +name = "FIXMIX-NET-NEOV4A" +description = "fixmix NeoNetwork Network - IPv4 A" + +["fd10:127:aa66::/48"] +type = "subnet" +name = "FIXMIX-NET-NEOV6A" +description = "fixmix NeoNetwork Network - IPv6 A" diff --git a/route/AS4201270021.toml b/route/AS4201270021.toml new file mode 100644 index 0000000..a70ecad --- /dev/null +++ b/route/AS4201270021.toml @@ -0,0 +1,9 @@ +["10.127.66.0/24"] +type = "subnet" +name = "FIXMIX-NET-NEOV4A" +description = "fixmix NeoNetwork Network - IPv4 A" + +["fd10:127:aa66::/48"] +type = "subnet" +name = "FIXMIX-NET-NEOV6A" +description = "fixmix NeoNetwork Network - IPv6 A" diff --git a/route/AS4242421876.toml b/route/AS4242421876.toml new file mode 100644 index 0000000..a70ecad --- /dev/null +++ b/route/AS4242421876.toml @@ -0,0 +1,9 @@ +["10.127.66.0/24"] +type = "subnet" +name = "FIXMIX-NET-NEOV4A" +description = "fixmix NeoNetwork Network - IPv4 A" + +["fd10:127:aa66::/48"] +type = "subnet" +name = "FIXMIX-NET-NEOV6A" +description = "fixmix NeoNetwork Network - IPv6 A" From 9b4dc5d0d69e2903c64fc36f072f5d92f7737a04 Mon Sep 17 00:00:00 2001 From: David Zhixu Liu Date: Tue, 23 Mar 2021 11:30:27 +0800 Subject: [PATCH 4/7] Add mastodon to entity/DavidLiu --- entity/DavidLiu.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/entity/DavidLiu.toml b/entity/DavidLiu.toml index f7ba430..ac1d176 100644 --- a/entity/DavidLiu.toml +++ b/entity/DavidLiu.toml @@ -5,6 +5,7 @@ babel = ["zh-N", "en-3"] email = "david@fixmix.tech" telegram = "p0tat05" irc = "p0tat05" +mastodon = "@p0tat05@mastodon.online" github = "p0tat05" [persona] From 62cd2e3f93d88367a38cf72151fb998d7cf90a52 Mon Sep 17 00:00:00 2001 From: David Zhixu Liu Date: Tue, 23 Mar 2021 21:47:36 +0800 Subject: [PATCH 5/7] Modify a few details --- asn/AS211876.toml | 2 +- asn/AS4201270021.toml | 2 +- asn/AS4242421876.toml | 2 +- entity/{DavidLiu.toml => David Liu.toml} | 2 +- node/{DavidLiu.toml => fixmix.toml} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename entity/{DavidLiu.toml => David Liu.toml} (91%) rename node/{DavidLiu.toml => fixmix.toml} (100%) diff --git a/asn/AS211876.toml b/asn/AS211876.toml index 674c755..57fa5b1 100644 --- a/asn/AS211876.toml +++ b/asn/AS211876.toml @@ -1,4 +1,4 @@ name = "AS-FIXMIX" -owner = "DavidLiu" +owner = "David Liu" description = "fixmix Global Experimental Network" source = "Internet" diff --git a/asn/AS4201270021.toml b/asn/AS4201270021.toml index d9353f2..cd9a1b2 100644 --- a/asn/AS4201270021.toml +++ b/asn/AS4201270021.toml @@ -1,3 +1,3 @@ name = "AS-FIXMIX-NEONETWORK" -owner = "DavidLiu" +owner = "David Liu" description = "fixmix NeoNetwork Network" diff --git a/asn/AS4242421876.toml b/asn/AS4242421876.toml index 2d68e6d..60e8aba 100644 --- a/asn/AS4242421876.toml +++ b/asn/AS4242421876.toml @@ -1,3 +1,3 @@ name = "AS-FIXMIX-DN42" -owner = "DavidLiu" +owner = "David Liu" description = "fixmix DN42 Network" diff --git a/entity/DavidLiu.toml b/entity/David Liu.toml similarity index 91% rename from entity/DavidLiu.toml rename to entity/David Liu.toml index ac1d176..efb2a6a 100644 --- a/entity/DavidLiu.toml +++ b/entity/David Liu.toml @@ -1,4 +1,4 @@ -name = "DavidLiu" +name = "David Liu" babel = ["zh-N", "en-3"] [contact] diff --git a/node/DavidLiu.toml b/node/fixmix.toml similarity index 100% rename from node/DavidLiu.toml rename to node/fixmix.toml From 4109a77969f5166c6545f0a1d50186364c5b6222 Mon Sep 17 00:00:00 2001 From: David Zhixu Liu Date: Tue, 23 Mar 2021 16:51:27 +0000 Subject: [PATCH 6/7] Fix some errors --- asn/AS211876.toml | 2 +- asn/AS4201270021.toml | 3 ++- asn/AS4242421876.toml | 2 +- entity/David Liu.toml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/asn/AS211876.toml b/asn/AS211876.toml index 57fa5b1..c842ff9 100644 --- a/asn/AS211876.toml +++ b/asn/AS211876.toml @@ -1,4 +1,4 @@ -name = "AS-FIXMIX" +name = "FIXMIX-AS" owner = "David Liu" description = "fixmix Global Experimental Network" source = "Internet" diff --git a/asn/AS4201270021.toml b/asn/AS4201270021.toml index cd9a1b2..f72cd78 100644 --- a/asn/AS4201270021.toml +++ b/asn/AS4201270021.toml @@ -1,3 +1,4 @@ -name = "AS-FIXMIX-NEONETWORK" +name = "FIXMIX-AS-NEONETWORK" owner = "David Liu" description = "fixmix NeoNetwork Network" + diff --git a/asn/AS4242421876.toml b/asn/AS4242421876.toml index 60e8aba..8273315 100644 --- a/asn/AS4242421876.toml +++ b/asn/AS4242421876.toml @@ -1,3 +1,3 @@ -name = "AS-FIXMIX-DN42" +name = "FIXMIX-AS-DN42" owner = "David Liu" description = "fixmix DN42 Network" diff --git a/entity/David Liu.toml b/entity/David Liu.toml index efb2a6a..57460e3 100644 --- a/entity/David Liu.toml +++ b/entity/David Liu.toml @@ -5,7 +5,7 @@ babel = ["zh-N", "en-3"] email = "david@fixmix.tech" telegram = "p0tat05" irc = "p0tat05" -mastodon = "@p0tat05@mastodon.online" +mastodon = "@p0tat05@mas.to" github = "p0tat05" [persona] From a6140af923c220003242a2a7400266928e9b19ab Mon Sep 17 00:00:00 2001 From: Outvi V <19144373+outloudvi@users.noreply.github.com> Date: Thu, 25 Mar 2021 03:14:16 +0800 Subject: [PATCH 7/7] feat: update LibreHouse.toml to in line with dn42 (#159) --- entity/LibreHouse.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entity/LibreHouse.toml b/entity/LibreHouse.toml index 7b81796..01559b7 100644 --- a/entity/LibreHouse.toml +++ b/entity/LibreHouse.toml @@ -4,8 +4,8 @@ babel = ["zh-N", "en-2"] [contact] email = "i+noc@outv.im" telegram = "outvi" -mastodon = "@outvi@moe.cat" +mastodon = "@ov@social.outv.im" github = "outloudvi" [persona] -pgp = "47627D2288B20CC033C7B7D72D83E4E89C15DA36" +pgp = "7A9543829E475D7D3826B08DA725CB57CA65CAFE"