From 94bdd9ea8dcc88317998622c6a0df8fa61a03eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Dost=C3=A1l?= Date: Sun, 23 Jul 2023 12:25:55 +0200 Subject: [PATCH] Rejoin PDOSTAL-MNT to dn42 The list of subnets I keep: fd42:4242:339::/48, 172.22.172.0/27, 172.23.250.0/27 The list of subnets I return: 172.20.235.112/28, 172.21.67.32/27 The domain I would like to use: pdostal.dn42 I'm still in the process of setup, DNSSEC will be added later. --- data/aut-num/AS4242420339 | 1 - data/dns/pdostal.dn42 | 7 +++++++ data/inet6num/fd42:4242:339::_48 | 5 ++--- data/inetnum/172.20.235.112_28 | 13 ------------- data/inetnum/172.21.67.32_27 | 10 ---------- data/inetnum/172.22.172.0_27 | 5 +++-- data/inetnum/172.23.250.0_27 | 5 +++-- data/mntner/PDOSTAL-MNT | 5 +++-- data/person/PDOSTAL-DN42 | 4 +--- data/route/172.20.235.112_28 | 5 ----- data/route/172.21.67.32_27 | 5 ----- data/route/172.22.172.0_27 | 1 - data/route/172.23.250.0_27 | 4 ++++ data/route6/fd42:4242:339::_48 | 1 - 14 files changed, 23 insertions(+), 48 deletions(-) create mode 100644 data/dns/pdostal.dn42 delete mode 100644 data/inetnum/172.20.235.112_28 delete mode 100644 data/inetnum/172.21.67.32_27 delete mode 100644 data/route/172.20.235.112_28 delete mode 100644 data/route/172.21.67.32_27 create mode 100644 data/route/172.23.250.0_27 diff --git a/data/aut-num/AS4242420339 b/data/aut-num/AS4242420339 index fd05960fb..df1a4fed7 100644 --- a/data/aut-num/AS4242420339 +++ b/data/aut-num/AS4242420339 @@ -1,6 +1,5 @@ aut-num: AS4242420339 as-name: PDOSTAL-AS -descr: Pavel Dostal's dn42 AS number admin-c: PDOSTAL-DN42 tech-c: PDOSTAL-DN42 mnt-by: PDOSTAL-MNT diff --git a/data/dns/pdostal.dn42 b/data/dns/pdostal.dn42 new file mode 100644 index 000000000..ec24b10dc --- /dev/null +++ b/data/dns/pdostal.dn42 @@ -0,0 +1,7 @@ +domain: pdostal.dn42 +admin-c: PDOSTAL-DN42 +tech-c: PDOSTAL-DN42 +mnt-by: PDOSTAL-MNT +nserver: ns1.pdostal.dn42 172.23.250.1 +nserver: ns1.pdostal.dn42 fd42:4242:339:23::1 +source: DN42 diff --git a/data/inet6num/fd42:4242:339::_48 b/data/inet6num/fd42:4242:339::_48 index 01a923196..2ffd2670e 100644 --- a/data/inet6num/fd42:4242:339::_48 +++ b/data/inet6num/fd42:4242:339::_48 @@ -1,12 +1,11 @@ inet6num: fd42:4242:0339:0000:0000:0000:0000:0000 - fd42:4242:0339:ffff:ffff:ffff:ffff:ffff netname: PDOSTAL-IP6 -descr: Pavel Dostal's fd42:4242:0339::/48 block +descr: pdostal IPv6 network country: CZ admin-c: PDOSTAL-DN42 tech-c: PDOSTAL-DN42 mnt-by: PDOSTAL-MNT -nserver: cucumber.dn42 -nserver: grape.dn42 +nserver: ns1.pdostal.dn42 status: ASSIGNED cidr: fd42:4242:339::/48 source: DN42 diff --git a/data/inetnum/172.20.235.112_28 b/data/inetnum/172.20.235.112_28 deleted file mode 100644 index 1bb42f00a..000000000 --- a/data/inetnum/172.20.235.112_28 +++ /dev/null @@ -1,13 +0,0 @@ -inetnum: 172.20.235.112 - 172.20.235.127 -netname: PDOSTAL-IP4PDNAT -remarks: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCW1AFnflfnPfKg12oAlESachI/BKlMXQ4CpAHBqrVBqlyb4bbma9fNNAlomD+qzKkorxRGIkxK/6WwIwTZpaiz84H+FlpIrPJeiz1jDeSqW+apP/trh95CvwKgCocXZQeA8O0lRy1RtPZYwKNONR427urIYTavrFcxpqeEYD/C2A+v4QdGlSJQHXsMbgZ2egFJlG7n/b0o4tJAH4YmiiKIECq7S03SHWzd8d5ZKzSxwGq35C/HBLBcgvi47jSQZC9H4eyuFY8xSb+fvi4jPXaZlbDlDaJJ9GrwgWbjyJIiwyMAhrxlaG31DmcJoMecxZ0f/ZXIDCSzSG02N93SsBH7 pdostal@pdostal.cz -descr: Pavel Dostal's PDNAT 172.20.235.112/28 block -country: CZ -admin-c: PDOSTAL-DN42 -tech-c: PDOSTAL-DN42 -mnt-by: PDOSTAL-MNT -nserver: cucumber.pdostal.dn42 -nserver: grape.pdostal.dn42 -status: ASSIGNED -cidr: 172.20.235.112/28 -source: DN42 diff --git a/data/inetnum/172.21.67.32_27 b/data/inetnum/172.21.67.32_27 deleted file mode 100644 index 68c3a3b33..000000000 --- a/data/inetnum/172.21.67.32_27 +++ /dev/null @@ -1,10 +0,0 @@ -inetnum: 172.21.67.32 - 172.21.67.63 -netname: PDOSTAL-IP4PDOSTAL -descr: Pavel Dostal's PDOSTAL 172.21.67.32/27 block -country: CZ -admin-c: PDOSTAL-DN42 -tech-c: PDOSTAL-DN42 -mnt-by: PDOSTAL-MNT -status: ASSIGNED -cidr: 172.21.67.32/27 -source: DN42 diff --git a/data/inetnum/172.22.172.0_27 b/data/inetnum/172.22.172.0_27 index 2af833e7e..8b6069851 100644 --- a/data/inetnum/172.22.172.0_27 +++ b/data/inetnum/172.22.172.0_27 @@ -1,10 +1,11 @@ inetnum: 172.22.172.0 - 172.22.172.31 -netname: PDOSTAL-IP4PDHOME -descr: Pavel Dostal's PDHOME 172.22.172.0/27 block +netname: PDOSTAL-IP4VPN +descr: pdostal IPv4 VPN network country: CZ admin-c: PDOSTAL-DN42 tech-c: PDOSTAL-DN42 mnt-by: PDOSTAL-MNT +nserver: ns1.pdostal.dn42 status: ASSIGNED cidr: 172.22.172.0/27 source: DN42 diff --git a/data/inetnum/172.23.250.0_27 b/data/inetnum/172.23.250.0_27 index 2fbc3b409..c161e844e 100644 --- a/data/inetnum/172.23.250.0_27 +++ b/data/inetnum/172.23.250.0_27 @@ -1,10 +1,11 @@ inetnum: 172.23.250.0 - 172.23.250.31 -netname: PDOSTAL-IP4CARAMBOLA -descr: Pavel Dostal's CARAMBOLA 172.23.250.0/27 block +netname: PDOSTAL-IP4KVM +descr: pdostal IPv4 KVM network country: CZ admin-c: PDOSTAL-DN42 tech-c: PDOSTAL-DN42 mnt-by: PDOSTAL-MNT +nserver: ns1.pdostal.dn42 status: ASSIGNED cidr: 172.23.250.0/27 source: DN42 diff --git a/data/mntner/PDOSTAL-MNT b/data/mntner/PDOSTAL-MNT index 42795e246..f7bb8952c 100644 --- a/data/mntner/PDOSTAL-MNT +++ b/data/mntner/PDOSTAL-MNT @@ -1,6 +1,7 @@ mntner: PDOSTAL-MNT descr: Pavel Dostal -admin-c: DUMMY-DN42 -tech-c: DUMMY-DN42 +admin-c: PDOSTAL-DN42 +tech-c: PDOSTAL-DN42 mnt-by: PDOSTAL-MNT +auth: pgp-fingerprint CEC9A9AAB7F69CE84136D67A65BDCDAB70974BA9 source: DN42 diff --git a/data/person/PDOSTAL-DN42 b/data/person/PDOSTAL-DN42 index ad5c39db9..c3341dacd 100644 --- a/data/person/PDOSTAL-DN42 +++ b/data/person/PDOSTAL-DN42 @@ -1,9 +1,7 @@ person: PDOSTAL -contact: dn42@pdostal.cz -contact: xmpp:pdostal@jabber.cz +e-mail: pdostal@pdostal.cz contact: irc:pdostal@hackint contact: twitter:pdostal_en -pgp-fingerprint: CEC9A9AAB7F69CE84136D67A65BDCDAB70974BA9 nic-hdl: PDOSTAL-DN42 mnt-by: PDOSTAL-MNT source: DN42 diff --git a/data/route/172.20.235.112_28 b/data/route/172.20.235.112_28 deleted file mode 100644 index ca51c6fb8..000000000 --- a/data/route/172.20.235.112_28 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.20.235.112/28 -descr: Pavel Dostál's PDNAT 172.20.235.112/28 route -origin: AS4242420339 -mnt-by: PDOSTAL-MNT -source: DN42 diff --git a/data/route/172.21.67.32_27 b/data/route/172.21.67.32_27 deleted file mode 100644 index 0c3dded10..000000000 --- a/data/route/172.21.67.32_27 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.21.67.32/27 -descr: Pavel Dostál's PDOSTAL 172.21.67.32/27 route -origin: AS4242420339 -mnt-by: PDOSTAL-MNT -source: DN42 diff --git a/data/route/172.22.172.0_27 b/data/route/172.22.172.0_27 index ff3cdccc4..60717151e 100644 --- a/data/route/172.22.172.0_27 +++ b/data/route/172.22.172.0_27 @@ -1,5 +1,4 @@ route: 172.22.172.0/27 -descr: Pavel Dostal's DNHOME 172.22.172.0/27 route origin: AS4242420339 mnt-by: PDOSTAL-MNT source: DN42 diff --git a/data/route/172.23.250.0_27 b/data/route/172.23.250.0_27 new file mode 100644 index 000000000..bc4c32112 --- /dev/null +++ b/data/route/172.23.250.0_27 @@ -0,0 +1,4 @@ +route: 172.23.250.0/27 +origin: AS4242420339 +mnt-by: PDOSTAL-MNT +source: DN42 diff --git a/data/route6/fd42:4242:339::_48 b/data/route6/fd42:4242:339::_48 index 0fc583526..fc220b19d 100644 --- a/data/route6/fd42:4242:339::_48 +++ b/data/route6/fd42:4242:339::_48 @@ -1,5 +1,4 @@ route6: fd42:4242:339::/48 -descr: The fd42:4242:0339::/48 prefix route origin: AS4242420339 mnt-by: PDOSTAL-MNT source: DN42