1
0
Fork 0
mirror of https://github.com/NeoCloud/NeoNetwork synced 2024-11-22 16:40:41 +08:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
MagicNeko(Dev:Desktop) 2021-04-12 12:27:12 +08:00
commit 9a232ff415
No known key found for this signature in database
GPG key ID: 57604E26E6FDC8A3
15 changed files with 77 additions and 5 deletions

4
asn/AS211876.toml Normal file
View file

@ -0,0 +1,4 @@
name = "FIXMIX-AS"
owner = "David Liu"
description = "fixmix Global Experimental Network"
source = "Internet"

4
asn/AS38173.toml Normal file
View file

@ -0,0 +1,4 @@
name = "SUNNET"
description = "SUNNET"
owner = "SUNNET"
source = "Internet"

4
asn/AS4201270021.toml Normal file
View file

@ -0,0 +1,4 @@
name = "FIXMIX-AS-NEONETWORK"
owner = "David Liu"
description = "fixmix NeoNetwork Network"

3
asn/AS4242421876.toml Normal file
View file

@ -0,0 +1,3 @@
name = "FIXMIX-AS-DN42"
owner = "David Liu"
description = "fixmix DN42 Network"

View file

@ -70,3 +70,5 @@ $TTL 604800
12 IN NS ns1.yangfl.dn42.
12 IN NS ns2.yangfl.dn42.
21 IN NS ns.iedon.neo.

View file

@ -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

12
entity/David Liu.toml Normal file
View file

@ -0,0 +1,12 @@
name = "David Liu"
babel = ["zh-N", "en-3"]
[contact]
email = "david@fixmix.tech"
telegram = "p0tat05"
irc = "p0tat05"
mastodon = "@p0tat05@mas.to"
github = "p0tat05"
[persona]
pgp = "11BA9B106D0DF5E6A1C4BC180641F2177A5530C0"

View file

@ -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"

2
node/fixmix.toml Normal file
View file

@ -0,0 +1,2 @@
[fixmix]
asn = 4201270021

View file

@ -1,4 +1,2 @@
[iEdon]
asn = 4242422189
description = "IEDON-NET"
cidr = ["10.127.21.1/24"]

9
route/AS211876.toml Normal file
View file

@ -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"

8
route/AS38173.toml Normal file
View file

@ -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"

9
route/AS4201270021.toml Normal file
View file

@ -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"

9
route/AS4242421876.toml Normal file
View file

@ -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"

View file

@ -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"