From cad9d2c6763fa1e8b2541c420b3c6769307a3568 Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 23 Oct 2020 01:48:24 +0800 Subject: [PATCH] modified: dns/db.10.127 modified: node/magicneko.toml deleted: peer/MagicNeko-HK01.toml new file: peer/koishi.toml new file: peer/liqingge.toml renamed: peer/MagicNeko-JP03.toml -> peer/yuezhengling.toml --- dns/db.10.127 | 6 +++--- node/magicneko.toml | 8 ++++---- peer/MagicNeko-HK01.toml | 1 - peer/koishi.toml | 1 + peer/liqingge.toml | 1 + peer/{MagicNeko-JP03.toml => yuezhengling.toml} | 3 +++ 6 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 peer/MagicNeko-HK01.toml create mode 100644 peer/koishi.toml create mode 100644 peer/liqingge.toml rename peer/{MagicNeko-JP03.toml => yuezhengling.toml} (74%) diff --git a/dns/db.10.127 b/dns/db.10.127 index edce17e..90599ad 100644 --- a/dns/db.10.127 +++ b/dns/db.10.127 @@ -19,7 +19,7 @@ $TTL 604800 1.3 IN PTR pan.neo. 16.2 IN PTR caasih.neo. -1.233 IN PTR icecat-gw04.magicneko.imiku.cn. +1.233 IN PTR liqingge.gw.magicneko.neo. 1.4 IN PTR Abolition-hk.bb.magicneko.neo. 10.4 IN PTR 10.127.4.10.hk-01.bb.magicneko.neo. 12.4 IN PTR 10.127.4.12.hk-02.bb.magicneko.neo. @@ -55,9 +55,9 @@ $TTL 604800 ; Loopback Addresses 1.255 IN PTR NeoPDP-11.neo. -2.255 IN PTR ucbvax.neo. 4.255 IN PTR pan.neo. -53.255 IN PTR JerryXiao-Anycast4.neo. +53.255 IN PTR anycast-auth-4.neo. +54.255 IN PTR anycast-recur-4.neo. 56.255 IN PTR frank-hsinchu-1.neo. 80.255 IN PTR NeoSystem.neo. 117.255 IN PTR magicneko-tw.neo. diff --git a/node/magicneko.toml b/node/magicneko.toml index d5eb81a..d6bb438 100644 --- a/node/magicneko.toml +++ b/node/magicneko.toml @@ -1,16 +1,16 @@ -[MagicNekoCN-liqingge] +[liqingge] asn = 4201270005 cidr = ["10.127.233.1/24", "10.127.234.1/24" , "10.127.235.1/24" , "10.127.236.1/24" , "fd10:127:233:1c3c::1/64" , "fd10:127:234::/48"] -[MagicNekoAsia-luotianyi] +[luotianyi] asn = 4201270008 cidr = ["10.127.4.10/32", "fd10:127:233:1270:10:127:4:10/128"] -[MagicNekoAsia-koishi] +[koishi] asn = 4201270008 cidr = ["10.127.4.8/32", "fd10:127:233:1270:10:127:4:8/128" , "fd10:127:233:1270::1/128"] -[MagicNekoAsia-yuezhengling] +[yuezhengling] asn = 4201270008 cidr = ["10.127.4.15/32", "fd10:127:233:1270:10:127:4:15/128"] diff --git a/peer/MagicNeko-HK01.toml b/peer/MagicNeko-HK01.toml deleted file mode 100644 index 1a43d55..0000000 --- a/peer/MagicNeko-HK01.toml +++ /dev/null @@ -1 +0,0 @@ -to-peer = ["Icecat-GroupAccessNetwork", "SUNNET"] diff --git a/peer/koishi.toml b/peer/koishi.toml new file mode 100644 index 0000000..20363ae --- /dev/null +++ b/peer/koishi.toml @@ -0,0 +1 @@ +to-peer = ["liqingge" , "yuezhengling" , "luotianyi" ,"JerryXiao-HK1"] diff --git a/peer/liqingge.toml b/peer/liqingge.toml new file mode 100644 index 0000000..083bd91 --- /dev/null +++ b/peer/liqingge.toml @@ -0,0 +1 @@ +to-peer = ["koishi" , "yuezhengling" , "luotianyi" ,"JerryXiao-SH1"] diff --git a/peer/MagicNeko-JP03.toml b/peer/yuezhengling.toml similarity index 74% rename from peer/MagicNeko-JP03.toml rename to peer/yuezhengling.toml index 11591f4..8cc2b68 100644 --- a/peer/MagicNeko-JP03.toml +++ b/peer/yuezhengling.toml @@ -1,4 +1,7 @@ to-peer = [ + "liqingge", + "koishi", + "luotianyi", "JerryXiao", "Ndoskrnl-US01", "chenx97",