diff --git a/README.md b/README.md index 15b8e2b..d4a0d0a 100644 --- a/README.md +++ b/README.md @@ -181,47 +181,47 @@ | Upstream | Downstream | |---------------|---------------| +| staph | septs | +| Ndoskrnl-US01 | Ndoskrnl-CN01 | | JerryXiao-SH1 | JerryXiao-HK1 | +| caasih | NeoPDP-11 | +| caasih | staph | +| SaruIruka | SaruHome | +| SaruIruka | SaruSaru | +| SaruIruka | SaruUmidanuki | +| SaruIruka | SaruYagi | +| NeoPDP-11 | NeoVAX | | septs | James58899 | | septs | JerryXiao | | septs | LanTian | | septs | frank-hsinchu | | septs | megumiLHS | -| SaruIruka | SaruHome | -| SaruIruka | SaruSaru | -| SaruIruka | SaruUmidanuki | -| SaruIruka | SaruYagi | -| Ndoskrnl-US01 | Ndoskrnl-CN01 | +| pan | NeoPDP-11 | +| pan | NeoSystem | +| pan | NeoVAX | | NeoSystem | NeoVAX | -| caasih | NeoPDP-11 | -| caasih | staph | -| SaruSaru | SaruHome | -| SaruSaru | SaruIruka | -| SaruSaru | SaruUmidanuki | -| SaruSaru | SaruYagi | -| SaruHome | SaruSaru | -| SaruHome | SaruIruka | -| SaruHome | SaruUmidanuki | -| SaruHome | SaruYagi | +| JerryXiao-HK1 | JerryXiao-HK2 | | SaruUmidanuki | SaruHome | | SaruUmidanuki | SaruSaru | | SaruUmidanuki | SaruIruka | | SaruUmidanuki | SaruYagi | -| staph | septs | -| JerryXiao | JerryXiao-HK1 | -| JerryXiao | JerryXiao-SH1 | -| JerryXiao | LanTian | -| JerryXiao | dfceaef | -| NeoPDP-11 | NeoVAX | -| pan | NeoPDP-11 | -| pan | NeoSystem | -| pan | NeoVAX | +| cklvax | NeoSystem | | SaruYagi | SaruHome | | SaruYagi | SaruSaru | | SaruYagi | SaruIruka | | SaruYagi | SaruUmidanuki | -| cklvax | NeoSystem | -| JerryXiao-HK1 | JerryXiao-HK2 | +| JerryXiao | JerryXiao-HK1 | +| JerryXiao | JerryXiao-SH1 | +| JerryXiao | LanTian | +| JerryXiao | dfceaef | +| SaruHome | SaruSaru | +| SaruHome | SaruIruka | +| SaruHome | SaruUmidanuki | +| SaruHome | SaruYagi | +| SaruSaru | SaruHome | +| SaruSaru | SaruIruka | +| SaruSaru | SaruUmidanuki | +| SaruSaru | SaruYagi | ## Route table diff --git a/dns/named_trust_anchors.conf b/dns/named_trust_anchors.conf index 32a7930..e080efe 100644 --- a/dns/named_trust_anchors.conf +++ b/dns/named_trust_anchors.conf @@ -1,8 +1,8 @@ trust-anchors { - neo. static-key 257 3 13 "jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg=="; - neo. static-key 257 3 15 "eE/0MWGb7wYP4U/kf5mXCbE8tGIwo1U++dp22Fumo+g="; 7.2.1.0.0.1.d.f.ip6.arpa. static-key 257 3 13 "sI90N0KcwXtpqNDmsagKH/761EzsjSlGyYxx338qRrDlzRwXQPG6bO1m HoTdnKrWBcd1JqYM0/tgDXKep7dJgA=="; 7.2.1.0.0.1.d.f.ip6.arpa. static-key 257 3 15 "aneEeuuJL47gPJJzT6ZbOgB9HlKpQmkkPNJNvK2z1pI="; 127.10.in-addr.arpa. static-key 257 3 13 "QVgt1c+OlL9X9jrnD39njabYFCi2eEYjLI5AvpXT6HWAF1BbAOfNm/56 4OeU03oDcCgQ6zNQMV0FNPvrk53K0w=="; 127.10.in-addr.arpa. static-key 257 3 15 "PWTkwcNA5jJqNYSsyeHt0xnxh1wZQ5//UmMuMPi5DlU="; + neo. static-key 257 3 13 "jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg=="; + neo. static-key 257 3 15 "eE/0MWGb7wYP4U/kf5mXCbE8tGIwo1U++dp22Fumo+g="; } diff --git a/dns/neonetwork b/dns/neonetwork index 423193b..b10ea66 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -1,7 +1,7 @@ ; NeoNetwork DNS Record $TTL 3600 @ IN SOA root-dns.neo. root.neo. ( - 85250588 ; Serial + 86568128 ; Serial 900 ; Refresh 900 ; Retry 86400 ; Expire @@ -35,10 +35,11 @@ home.edwardp IN A 10.127.18.33 home.edwardp IN AAAA fd10:127:2f2f:2333::1 jp1.edwardp IN A 10.127.18.34 jp1.edwardp IN AAAA fd10:127:2f2f:2334::1 -jp2.edwardp IN A 10.127.18.37 -jp2.edwardp IN AAAA fd10:127:2f2f:2337::1 edwardp IN CNAME home.edwardp mc.edwardp IN CNAME home.edwardp +live.edwardp IN CNAME home.edwardp +dynmap.edwardp IN CNAME home.edwardp +schem.edwardp IN CNAME home.edwardp tv IN A 10.127.15.58 diff --git a/neonetwork.json b/neonetwork.json index f7cb319..804eaf9 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1673245261, - "valid": 1674454861 + "generated": 1673444170, + "valid": 1674653770 }, "people": { "186526": { @@ -2302,19 +2302,6 @@ } }, "dnssec": [ - { - "zone": "neo.", - "records": [ - { - "dnskey": "257 3 13 jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg==", - "ds": "56336 13 2 317f7cc14d2f74abf560cfce6f89f5187872573ba5a7af9a9b14cf47e51489e5" - }, - { - "dnskey": "257 3 15 eE/0MWGb7wYP4U/kf5mXCbE8tGIwo1U++dp22Fumo+g=", - "ds": "37727 15 2 c32191a298279d16846eeefc157eec6be69be8edfeb4f3145c685f0752a73a8d" - } - ] - }, { "zone": "7.2.1.0.0.1.d.f.ip6.arpa.", "records": [ @@ -2340,6 +2327,19 @@ "ds": "22644 15 2 ba8389bd2f3ea36b7280a9a166fa3cc05d6af53a3ff987e62d37cf401d2c380b" } ] + }, + { + "zone": "neo.", + "records": [ + { + "dnskey": "257 3 13 jDd4k21xTgqOFqtvQkeqdQs/RH5+SU+vFchqnOHk5yaEL6EQDOKNuYJ2 C4ld+tVHf007GgbKX6BC68uMU8iGIg==", + "ds": "56336 13 2 317f7cc14d2f74abf560cfce6f89f5187872573ba5a7af9a9b14cf47e51489e5" + }, + { + "dnskey": "257 3 15 eE/0MWGb7wYP4U/kf5mXCbE8tGIwo1U++dp22Fumo+g=", + "ds": "37727 15 2 c32191a298279d16846eeefc157eec6be69be8edfeb4f3145c685f0752a73a8d" + } + ] } ] } \ No newline at end of file diff --git a/roa46.json b/roa46.json index a8d998f..65eb721 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { "counts": 148, - "generated": 1673245261, - "valid": 1674454861 + "generated": 1673444170, + "valid": 1674653770 }, "roas": [ {