From 3be609ae6b35cfa0ba6e2d708dd6bafb5ddc6708 Mon Sep 17 00:00:00 2001 From: Aleksandr Muravja Date: Thu, 31 Aug 2023 22:04:52 +0300 Subject: [PATCH] squashed commit: a5abdcce9 Adding mnt to ASM-NET 4af63b422 squashed commit: ### DN42 Signature ### method: ssh-git ### mntner: KYBERORG-MNT --- data/aut-num/AS4242423786 | 7 ++++--- data/dns/klab.dn42 | 12 ++++++++++++ data/dns/kyb.dn42 | 11 ----------- data/inet6num/fd21:3080:3080::_48 | 13 +++++++------ data/inet6num/fd21:3087::_48 | 2 +- data/inetnum/172.22.142.16_28 | 3 ++- data/inetnum/172.23.231.0_27 | 12 +++++++----- data/mntner/KYBERORG-MNT | 2 +- data/organisation/{ORG-KYB => ORG-KLAB} | 5 +++-- data/route/172.23.231.0_27 | 1 + data/route6/fd21:3080:3080::_48 | 1 + 11 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 data/dns/klab.dn42 delete mode 100644 data/dns/kyb.dn42 rename data/organisation/{ORG-KYB => ORG-KLAB} (57%) diff --git a/data/aut-num/AS4242423786 b/data/aut-num/AS4242423786 index 4bf8dcd0c..e319ab4a6 100644 --- a/data/aut-num/AS4242423786 +++ b/data/aut-num/AS4242423786 @@ -1,9 +1,10 @@ aut-num: AS4242423786 -as-name: KYB-AS -descr: Kyb HomeLab AS +as-name: KLAB-AS +descr: KLab HomeLab AS admin-c: KYBERORG-DN42 tech-c: KYBERORG-DN42 -org: ORG-KYB +org: ORG-KLAB remarks: Peer with me at asm@kmail.ee mnt-by: KYBERORG-MNT +mnt-by: JUSSI-MNT source: DN42 diff --git a/data/dns/klab.dn42 b/data/dns/klab.dn42 new file mode 100644 index 000000000..9a6b8e30a --- /dev/null +++ b/data/dns/klab.dn42 @@ -0,0 +1,12 @@ +domain: klab.dn42 +descr: KLab domain +admin-c: KYBERORG-DN42 +tech-c: KYBERORG-DN42 +mnt-by: KYBERORG-MNT +mnt-by: JUSSI-MNT +org: ORG-KLAB +nserver: ns1.klab.dn42 172.23.231.1 +nserver: ns1.klab.dn42 fd21:3080:3080::1 +nserver: ns9.klab.dn42 172.23.231.11 +nserver: ns9.klab.dn42 fd21:3080:3080:9::11 +source: DN42 diff --git a/data/dns/kyb.dn42 b/data/dns/kyb.dn42 deleted file mode 100644 index d49690036..000000000 --- a/data/dns/kyb.dn42 +++ /dev/null @@ -1,11 +0,0 @@ -domain: kyb.dn42 -descr: Kyb's network domain -admin-c: KYBERORG-DN42 -tech-c: KYBERORG-DN42 -mnt-by: KYBERORG-MNT -org: ORG-KYB -nserver: ns1.kyb.dn42 172.23.231.1 -nserver: ns1.kyb.dn42 fd21:3080:3080::1 -nserver: ns9.kyb.dn42 172.23.231.11 -nserver: ns9.kyb.dn42 fd21:3080:3080:9::11 -source: DN42 diff --git a/data/inet6num/fd21:3080:3080::_48 b/data/inet6num/fd21:3080:3080::_48 index 15fc0dafd..d2892eaf8 100644 --- a/data/inet6num/fd21:3080:3080::_48 +++ b/data/inet6num/fd21:3080:3080::_48 @@ -1,14 +1,15 @@ inet6num: fd21:3080:3080:0000:0000:0000:0000:0000 - fd21:3080:3080:ffff:ffff:ffff:ffff:ffff cidr: fd21:3080:3080::/48 -netname: KYB-NETWORK -descr: Kyb HomeLab IPv6 Network Range -remarks: peer with me at asm@kmail.ee +netname: KLAB-NETWORK +descr: KLab HomeLab IPv6 Network Range +remarks: peer with us at asm@kmail.ee or jussi@kmail.ee country: EE admin-c: KYBERORG-DN42 tech-c: KYBERORG-DN42 -nserver: ns1.kyb.dn42 -nserver: ns9.kyb.dn42 -org: ORG-KYB +nserver: ns1.klab.dn42 +nserver: ns9.klab.dn42 +org: ORG-KLAB mnt-by: KYBERORG-MNT +mnt-by: JUSSI-MNT status: ASSIGNED source: DN42 diff --git a/data/inet6num/fd21:3087::_48 b/data/inet6num/fd21:3087::_48 index dd2d2a26b..8401aca33 100644 --- a/data/inet6num/fd21:3087::_48 +++ b/data/inet6num/fd21:3087::_48 @@ -1,7 +1,7 @@ inet6num: fd21:3087:0000:0000:0000:0000:0000:0000 - fd21:3087:0000:ffff:ffff:ffff:ffff:ffff cidr: fd21:3087::/48 netname: ASM-NETWORK -descr: Kyberorg XPerimental/Personal IPv6 Network Range +descr: Kyberorg Personal IPv6 Network Range remarks: peer with me at asm@kmail.ee country: EE admin-c: KYBERORG-DN42 diff --git a/data/inetnum/172.22.142.16_28 b/data/inetnum/172.22.142.16_28 index 850c58356..294a3dad6 100644 --- a/data/inetnum/172.22.142.16_28 +++ b/data/inetnum/172.22.142.16_28 @@ -1,11 +1,12 @@ inetnum: 172.22.142.16 - 172.22.142.31 cidr: 172.22.142.16/28 netname: ASM-NETWORK -descr: Kyberorg XPerimental/Personal IPv4 Network Range +descr: Kyberorg Personal IPv4 Network Range remarks: peer with me at asm@kmail.ee country: EE nserver: ns.asm.dn42 admin-c: KYBERORG-DN42 tech-c: KYBERORG-DN42 +mnt-by: KYBERORG-MNT status: ASSIGNED source: DN42 diff --git a/data/inetnum/172.23.231.0_27 b/data/inetnum/172.23.231.0_27 index 237dfff93..212f44700 100644 --- a/data/inetnum/172.23.231.0_27 +++ b/data/inetnum/172.23.231.0_27 @@ -1,12 +1,14 @@ inetnum: 172.23.231.0 - 172.23.231.31 cidr: 172.23.231.0/27 -netname: KYB-NETWORK -descr: Kyb HomeLab IPv4 Network Range -remarks: peer with me at asm@kmail.ee +netname: KLAB-NETWORK +descr: KLab HomeLab IPv4 Network Range +remarks: peer with us at asm@kmail.ee or jussi@kmail.ee country: EE -nserver: ns1.kyb.dn42 -nserver: ns9.kyb.dn42 +nserver: ns1.klab.dn42 +nserver: ns9.klab.dn42 admin-c: KYBERORG-DN42 tech-c: KYBERORG-DN42 +mnt-by: KYBERORG-MNT +mnt-by: JUSSI-MNT status: ASSIGNED source: DN42 diff --git a/data/mntner/KYBERORG-MNT b/data/mntner/KYBERORG-MNT index 2343acfd5..1f7d760e4 100644 --- a/data/mntner/KYBERORG-MNT +++ b/data/mntner/KYBERORG-MNT @@ -1,5 +1,5 @@ mntner: KYBERORG-MNT -descr: KYB-LAB +descr: KLab HomeLab SysOp admin-c: KYBERORG-DN42 tech-c: KYBERORG-DN42 mnt-by: KYBERORG-MNT diff --git a/data/organisation/ORG-KYB b/data/organisation/ORG-KLAB similarity index 57% rename from data/organisation/ORG-KYB rename to data/organisation/ORG-KLAB index aa8fa007d..08662f8e2 100644 --- a/data/organisation/ORG-KYB +++ b/data/organisation/ORG-KLAB @@ -1,6 +1,7 @@ -organisation: ORG-KYB -org-name: Kyb HomeLab +organisation: ORG-KLAB +org-name: KLab HomeLab admin-c: KYBERORG-DN42 tech-c: KYBERORG-DN42 mnt-by: KYBERORG-MNT +mnt-by: JUSSI-MNT source: DN42 diff --git a/data/route/172.23.231.0_27 b/data/route/172.23.231.0_27 index 83013a431..ed5be39f8 100644 --- a/data/route/172.23.231.0_27 +++ b/data/route/172.23.231.0_27 @@ -2,4 +2,5 @@ route: 172.23.231.0/27 origin: AS4242423786 max-length: 27 mnt-by: KYBERORG-MNT +mnt-by: JUSSI-MNT source: DN42 diff --git a/data/route6/fd21:3080:3080::_48 b/data/route6/fd21:3080:3080::_48 index 329270bbc..9709c91cc 100644 --- a/data/route6/fd21:3080:3080::_48 +++ b/data/route6/fd21:3080:3080::_48 @@ -2,4 +2,5 @@ route6: fd21:3080:3080::/48 origin: AS4242423786 max-length: 48 mnt-by: KYBERORG-MNT +mnt-by: JUSSI-MNT source: DN42