From 28324c31549f8e2b1162a56cc7d0c1db3e4c4ecb Mon Sep 17 00:00:00 2001 From: Marlinc Date: Sun, 12 Mar 2023 16:28:30 +0100 Subject: [PATCH] squashed commit: d4123a5c0 add irc contact details to my person object d660c3766 use personal ns and add ds keys for dnssec 443d92cbc improve routes 1940a5936 add public email as fallback to my person object 3ef955c37 add ssh-key as auth for MARLINC-MNT bb2899f96 use personal ns for my zones --- data/dns/marlinc.dn42 | 5 ++++- data/dns/nl-zuid.dn42 | 13 +++++++------ data/dns/speedtest.dn42 | 4 +++- data/inet6num/fd33:aba8:392::_48 | 5 ++++- data/inetnum/172.20.182.0_24 | 1 + data/inetnum/172.23.163.192_26 | 7 +++++-- data/mntner/MARLINC-MNT | 1 + data/person/MARLINC-DN42 | 3 +++ data/route/{172.20.182.0_25 => 172.20.182.0_24} | 2 +- data/route/172.23.163.192_26 | 3 ++- data/route6/fd33:aba8:392::_48 | 1 + 11 files changed, 32 insertions(+), 13 deletions(-) rename data/route/{172.20.182.0_25 => 172.20.182.0_24} (81%) diff --git a/data/dns/marlinc.dn42 b/data/dns/marlinc.dn42 index a8f9f74fc..a77653355 100644 --- a/data/dns/marlinc.dn42 +++ b/data/dns/marlinc.dn42 @@ -2,5 +2,8 @@ domain: marlinc.dn42 admin-c: MARLINC-DN42 tech-c: MARLINC-DN42 mnt-by: MARLINC-MNT -nserver: ns1.nl-zuid.dn42 +nserver: ns1.marlinc.dn42 172.23.163.230 +nserver: ns1.marlinc.dn42 fd33:aba8:392:10:4d8:c7ff:fe5f:a6d5 +ds-rdata: 28320 13 2 3d827b01fbf837e6d0de96d3acd50509e7a525b30c77b0c665dfe0c6908befaa +ds-rdata: 28320 13 4 d2de0c75cc533c217836e070f02a0f3cddae3a58323c47766fe2476456252bea1f8e3595b8849a9f25323f1c1e089976 source: DN42 diff --git a/data/dns/nl-zuid.dn42 b/data/dns/nl-zuid.dn42 index fbada540a..305e8345b 100644 --- a/data/dns/nl-zuid.dn42 +++ b/data/dns/nl-zuid.dn42 @@ -4,10 +4,11 @@ admin-c: NL-ZUID-DN42 tech-c: NL-ZUID-DN42 mnt-by: MARLINC-MNT mnt-by: VHAL-MNT -nserver: ns1.nl-zuid.dn42 172.23.23.228 -nserver: lavana.sjc.xuu.dn42 -nserver: rakta.fra.xuu.dn42 -nserver: ns1.grmml.dn42 -nserver: ns2.grmml.dn42 -nserver: ns3.grmml.dn42 +nserver: ns1.nl-zuid.dn42 172.23.163.230 +nserver: ns1.nl-zuid.dn42 fd33:aba8:392:10:4d8:c7ff:fe5f:a6d5 +remarks: NS2 has the same IPv4 address for now, will change this later +nserver: ns2.nl-zuid.dn42 172.23.163.230 +nserver: ns2.nl-zuid.dn42 fd33:aba8:392:10:48c2:1ff:fe1d:ed8f +ds-rdata: 58182 13 2 d4d593c8aeae95de84e3911bb06b47a0e111fd226b4d120816be71c699f9285e +ds-rdata: 58182 13 4 7ffe67c0394411a242c9aaf3c6e82193cedee91acfd3f5e54789f8af8ec50321a91b34f4dad274a61b6efc00f5d04a3d source: DN42 diff --git a/data/dns/speedtest.dn42 b/data/dns/speedtest.dn42 index fdce1af7a..14c6507d3 100644 --- a/data/dns/speedtest.dn42 +++ b/data/dns/speedtest.dn42 @@ -2,5 +2,7 @@ domain: speedtest.dn42 admin-c: NL-ZUID-DN42 tech-c: NL-ZUID-DN42 mnt-by: MARLINC-MNT -nserver: ns1.nl-zuid.dn42 +nserver: ns1.marlinc.dn42 +ds-rdata: 49793 13 2 9a7306ec2ef05e23934bc381ace8e917c2bae0e52297f59eb7feb2b57a5456b6 +ds-rdata: 49793 13 4 90d1575d3d11f5246ffb5bbe6cfa6573031aa49c099924b54d50b4cfd493da97f6efb60ef001bc67e0f972dc83906b67 source: DN42 diff --git a/data/inet6num/fd33:aba8:392::_48 b/data/inet6num/fd33:aba8:392::_48 index 1fa5f66a1..311932069 100644 --- a/data/inet6num/fd33:aba8:392::_48 +++ b/data/inet6num/fd33:aba8:392::_48 @@ -1,10 +1,13 @@ inet6num: fd33:aba8:0392:0000:0000:0000:0000:0000 - fd33:aba8:0392:ffff:ffff:ffff:ffff:ffff -netname: MARLINC-DN42 +netname: MARLINC-HOME descr: Marlinc admin-c: MARLINC-DN42 tech-c: MARLINC-DN42 mnt-by: MARLINC-MNT nserver: ns1.marlinc.dn42 +ds-rdata: 63185 13 2 bd4ca09fb2f3c752455f56f046a825841fae1440ef8834bac4ef60a3bcb0fb1a +ds-rdata: 63185 13 4 41c58a359ae7d35cdbfee5623903c0feb2a8064101c524eadc4a25a23f87ea71f900ea944f7ec32873a30903d48ff6b1 +country: NL status: ALLOCATED cidr: fd33:aba8:392::/48 source: DN42 diff --git a/data/inetnum/172.20.182.0_24 b/data/inetnum/172.20.182.0_24 index fcdd61025..f978633a1 100644 --- a/data/inetnum/172.20.182.0_24 +++ b/data/inetnum/172.20.182.0_24 @@ -5,6 +5,7 @@ remarks: Used for: remarks: - Amsterdam IX remarks: - Internal network nserver: ns1.nl-zuid.dn42 +nserver: ns2.nl-zuid.dn42 country: NL admin-c: NL-ZUID-DN42 tech-c: NL-ZUID-DN42 diff --git a/data/inetnum/172.23.163.192_26 b/data/inetnum/172.23.163.192_26 index bb1a2f4c3..0c9798c9b 100644 --- a/data/inetnum/172.23.163.192_26 +++ b/data/inetnum/172.23.163.192_26 @@ -4,7 +4,10 @@ descr: Home network tech-c: MARLINC-DN42 mnt-by: MARLINC-MNT status: ALLOCATED -nserver: ns1.nl-zuid.dn42 +nserver: ns1.marlinc.dn42 +ds-rdata: 30971 13 2 084143257688111c968e353d42afbf59f63b63b428efb73d8b1aa90ec6abc714 +ds-rdata: 30971 13 4 fb3f952bf324e3e9f08ca5f592c212fce37ce23732ea70c06b4106c07539ab4f2d0a39fe824135b5d621f42259ae0cbf +country: NL cidr: 172.23.163.192/26 -netname: Unnamed 172.23.163.192/26 Network +netname: MARLINC-HOME source: DN42 diff --git a/data/mntner/MARLINC-MNT b/data/mntner/MARLINC-MNT index 0e119b6b4..12f6a7497 100644 --- a/data/mntner/MARLINC-MNT +++ b/data/mntner/MARLINC-MNT @@ -1,6 +1,7 @@ mntner: MARLINC-MNT remarks: pin-sha256:oe5rzzhH2Xn51ehUtmHdrfhvslTYXeaaODFaM9C+p7Y= auth: pgp-fingerprint 3447AD948D18E6C25917F6E3FE267E2529E70DF1 +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDS0v3SXLigOwAz9T/rUpzmq+qTScaPLLLYjZv9bGgjf9Ay86+ZCngz0bA5RItbrsEEvIO1GXyJhKH8bInwmxjk/gKPXHh3QTeEjl0y38bmyaTSJtlum0myohZAkY9vDcOASbckMr8xcxP8d87/qDswdA3Ni0cerBi9XWw0Ru8qRtsPR4kNd/yGKrwPvjRkKLrIPazNd8d3JusfpgyayYFOqlDkVEcAU6Ddr+JHEhOTWoLH6VDCr8b5yl8bma2jv/gMOkjBPIQqUqqyj22sKmKdrnqnek2kCvSCfr3yn5GOloGg8COfKwjcRNmfI1orDd7AUhbkNsf1aoXR3yAXRrFoNBAjti3NHr65qfpETuE++KDHS0sd3bF4dI5+juFYe5HezkK9+2DmZ3vp2H7LDOhwMV2JI18HIYuUdmO4/8ziKDzCi6TEJ3FGrSbXVTXMVCXgP2xQpKaW1ZwOyT46Mb2KMmszgpLQKOtRg02/HsFM5nKx9L3t1b0IAhcxuh7W5sdTLtY6Hx+W124NeB2PDosdr0/iqie8qnUrCNzPNsUNNpHLAqTNUUfpKzZs0E2A9E7S/6bbRra/5ceiI4+5yR31nvEMawMcUbvI2c+QMjeNzZ7BzyK3q7lVbzfGeC8KA2UZEFrNEw2DenMOE9e7HOCea7YO1Zp6/E0dx39ygC+CTQ== yubi admin-c: MARLINC-DN42 tech-c: MARLINC-DN42 mnt-by: MARLINC-MNT diff --git a/data/person/MARLINC-DN42 b/data/person/MARLINC-DN42 index 7b23e3d4b..4c5545c8c 100644 --- a/data/person/MARLINC-DN42 +++ b/data/person/MARLINC-DN42 @@ -3,4 +3,7 @@ nic-hdl: MARLINC-DN42 www: https://marlinc.dn42 mnt-by: MARLINC-MNT e-mail: marlinc@marlinc.dn42 +e-mail: dn42@marlinc.nl +contact: irc:marlinc@hackint +contact: irc:marlinc@irc.dn42 source: DN42 diff --git a/data/route/172.20.182.0_25 b/data/route/172.20.182.0_24 similarity index 81% rename from data/route/172.20.182.0_25 rename to data/route/172.20.182.0_24 index 260f745a8..fdcef4606 100644 --- a/data/route/172.20.182.0_25 +++ b/data/route/172.20.182.0_24 @@ -1,4 +1,4 @@ -route: 172.20.182.0/25 +route: 172.20.182.0/24 descr: NL Zuid IXP range origin: AS4242420330 mnt-by: MARLINC-MNT diff --git a/data/route/172.23.163.192_26 b/data/route/172.23.163.192_26 index 3aeae4f91..b44c0a02f 100644 --- a/data/route/172.23.163.192_26 +++ b/data/route/172.23.163.192_26 @@ -1,5 +1,6 @@ route: 172.23.163.192/26 -descr: Route to Marlinc's home network +descr: Marlinc home network origin: AS4242423941 +max-length: 26 mnt-by: MARLINC-MNT source: DN42 diff --git a/data/route6/fd33:aba8:392::_48 b/data/route6/fd33:aba8:392::_48 index 54d623125..02239246a 100644 --- a/data/route6/fd33:aba8:392::_48 +++ b/data/route6/fd33:aba8:392::_48 @@ -1,5 +1,6 @@ route6: fd33:aba8:392::/48 descr: Marlinc home network origin: AS4242423941 +max-length: 48 mnt-by: MARLINC-MNT source: DN42