1
0
Fork 0
mirror of https://github.com/NeoCloud/NeoNetwork synced 2024-12-24 00:59:23 +08:00

Merge branch 'master' into master

This commit is contained in:
Neo_Chen 2020-04-20 22:54:21 +08:00 committed by GitHub
commit 2c7dc5b760
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions

View file

@ -5,3 +5,4 @@ AS Number Name
4200078274 Staph
4200012450 icecat
4200114514 chenx97
4200066666 JerryXiao

View file

@ -24,6 +24,7 @@ digraph "NeoNetwork Nodes"
magicneko_CN01 [label="M-CN1(10.127.4.100)"]
staph [label="s.aureus.ga"]
chenx97 [label="chenx97.neocloud.tw"]
JerryXiao [label="jpn.neo.jerryxiao.cc"]
subgraph cluster_croom {
label = "CROOM";
@ -57,4 +58,6 @@ digraph "NeoNetwork Nodes"
magicneko_JP03 -> icecat_Explosion
magicneko_CN01 -> icecat_Explosion
magicneko_CN01 -> icecat_Notebook
JerryXiao -> pan [dir=both]
JerryXiao -> ucbvax [dir=both]
}

View file

@ -25,6 +25,8 @@ Network ID Protocol Upstream Downstream Comment
10.127.0.64/30 Gre Icecat-Explosion<--> Icecat-Notebook No online time guarantee
10.127.0.68/30 Tinc caaish --> staph
10.127.0.72/30 WireGuard ucbvax <--> chenx97
10.127.0.76/30 WireGuard JerryXiao <--> pan
10.127.0.80/30 WireGuard JerryXiao <--> ucbvax
@1 --> Non-24H
@ -40,6 +42,8 @@ Subnet Name Comment
10.127.4.0/24 Icecat-Explosion For Magicneko Explosion Network Interworking address
10.127.5.0/24 CROOM-Netboot Netboot in CROOM
172.24.5.0/24 Icecat-Mobile-devices for Mobile device internal network segment for testing connectivity quality, No SLA
10.127.8.192/26 JerryXiao-Infrastructure For cloud instances
10.127.9.0/24 JerryXiao-Home For home
+======================+