From 88ff9687bf1d54f05f8359582dc3344f0bfca90d Mon Sep 17 00:00:00 2001 From: bodems Date: Fri, 4 Aug 2023 20:22:40 +0000 Subject: [PATCH] squashed commit: 1b688c87a forgot ssh-rsa bd9eb42a6 squashed commit: --- data/aut-num/AS4242421833 | 8 ++++++++ data/aut-num/AS4242423342 | 8 -------- data/aut-num/AS76124 | 9 --------- data/dns/acmelabs.dn42 | 8 ++++++++ data/dns/bodems.dn42 | 9 --------- data/inet6num/fd74:40ee:b38a::_48 | 11 ----------- data/inet6num/fddf:3897:eab6::_48 | 11 +++++++++++ data/inet6num/fdef:c0f:fe::_48 | 12 ------------ data/inetnum/172.23.146.0_24 | 8 ++++---- data/inetnum/172.23.45.0_24 | 11 ----------- data/mntner/BODEMS-MNT | 1 + data/organisation/ORG-ACME | 8 ++++++++ data/organisation/ORG-HSB | 8 -------- data/person/BODEMS-DN42 | 1 - data/route/172.23.146.0_24 | 4 ++-- data/route/172.23.45.0_24 | 5 ----- data/route6/fd74:40ee:b38a::_48 | 5 ----- data/route6/fddf:3897:eab6::_48 | 5 +++++ data/route6/fdef:c0f:fe::_48 | 5 ----- 19 files changed, 47 insertions(+), 90 deletions(-) create mode 100644 data/aut-num/AS4242421833 delete mode 100644 data/aut-num/AS4242423342 delete mode 100644 data/aut-num/AS76124 create mode 100644 data/dns/acmelabs.dn42 delete mode 100644 data/dns/bodems.dn42 delete mode 100644 data/inet6num/fd74:40ee:b38a::_48 create mode 100644 data/inet6num/fddf:3897:eab6::_48 delete mode 100644 data/inet6num/fdef:c0f:fe::_48 delete mode 100644 data/inetnum/172.23.45.0_24 create mode 100644 data/organisation/ORG-ACME delete mode 100644 data/organisation/ORG-HSB delete mode 100644 data/route/172.23.45.0_24 delete mode 100644 data/route6/fd74:40ee:b38a::_48 create mode 100644 data/route6/fddf:3897:eab6::_48 delete mode 100644 data/route6/fdef:c0f:fe::_48 diff --git a/data/aut-num/AS4242421833 b/data/aut-num/AS4242421833 new file mode 100644 index 000000000..74b361272 --- /dev/null +++ b/data/aut-num/AS4242421833 @@ -0,0 +1,8 @@ +aut-num: AS4242421833 +as-name: ACME-AS +descr: ACME Labs +org: ORG-ACME +tech-c: BODEMS-DN42 +admin-c: BODEMS-DN42 +mnt-by: BODEMS-MNT +source: DN42 diff --git a/data/aut-num/AS4242423342 b/data/aut-num/AS4242423342 deleted file mode 100644 index 77fd6d42a..000000000 --- a/data/aut-num/AS4242423342 +++ /dev/null @@ -1,8 +0,0 @@ -aut-num: AS4242423342 -as-name: HSB-AS -descr: Hackerspace Bielefeld -org: ORG-HSB -tech-c: BODEMS-DN42 -tech-c: BODEMS-DN42 -mnt-by: BODEMS-MNT -source: DN42 diff --git a/data/aut-num/AS76124 b/data/aut-num/AS76124 deleted file mode 100644 index 98ee4cef2..000000000 --- a/data/aut-num/AS76124 +++ /dev/null @@ -1,9 +0,0 @@ -aut-num: AS76124 -as-name: BODEMS-AS -descr: Bodems home AS -remarks: Feel free to ask for peering -remarks: new peerings require a BGP session with IPv6 -admin-c: BODEMS-DN42 -tech-c: BODEMS-DN42 -mnt-by: BODEMS-MNT -source: DN42 diff --git a/data/dns/acmelabs.dn42 b/data/dns/acmelabs.dn42 new file mode 100644 index 000000000..415c744ef --- /dev/null +++ b/data/dns/acmelabs.dn42 @@ -0,0 +1,8 @@ +domain: acmelabs.dn42 +nserver: rt-core.acmelabs.dn42 172.23.146.1 +nserver: rt-core.acmelabs.dn42 fddf:3897:eab6::1 +org: ORG-ACME +admin-c: BODEMS-DN42 +tech-c: BODEMS-DN42 +mnt-by: BODEMS-MNT +source: DN42 diff --git a/data/dns/bodems.dn42 b/data/dns/bodems.dn42 deleted file mode 100644 index bf98ef970..000000000 --- a/data/dns/bodems.dn42 +++ /dev/null @@ -1,9 +0,0 @@ -domain: bodems.dn42 -nserver: ns1.bodems.dn42 172.23.146.42 -nserver: ns1.bodems.dn42 fdef:c0f:fe:1337::42 -nserver: ns0.bodems.dn42 172.23.146.68 -nserver: ns0.bodems.dn42 fdef:c0f:fe:100:20d:b9ff:fe35:3aec -admin-c: BODEMS-DN42 -tech-c: BODEMS-DN42 -mnt-by: BODEMS-MNT -source: DN42 diff --git a/data/inet6num/fd74:40ee:b38a::_48 b/data/inet6num/fd74:40ee:b38a::_48 deleted file mode 100644 index eae0f1270..000000000 --- a/data/inet6num/fd74:40ee:b38a::_48 +++ /dev/null @@ -1,11 +0,0 @@ -inet6num: fd74:40ee:b38a:0000:0000:0000:0000:0000 - fd74:40ee:b38a:ffff:ffff:ffff:ffff:ffff -netname: HSB-ORG-NET6 -descr: Hackerspace Bielefeld IPv6 ULA -country: DE -org: ORG-HSB -admin-c: BODEMS-DN42 -tech-c: BODEMS-DN42 -mnt-by: BODEMS-MNT -status: ASSIGNED -cidr: fd74:40ee:b38a::/48 -source: DN42 diff --git a/data/inet6num/fddf:3897:eab6::_48 b/data/inet6num/fddf:3897:eab6::_48 new file mode 100644 index 000000000..509fee2e9 --- /dev/null +++ b/data/inet6num/fddf:3897:eab6::_48 @@ -0,0 +1,11 @@ +inet6num: fddf:3897:eab6:0000:0000:0000:0000:0000 - fddf:3897:eab6:ffff:ffff:ffff:ffff:ffff +cidr: fddf:3897:eab6::/48 +netname: ACME-ORG-NET6 +descr: ACME Labs IPv6 ULA +country: DE +org: ORG-ACME +admin-c: BODEMS-DN42 +tech-c: BODEMS-DN42 +mnt-by: BODEMS-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inet6num/fdef:c0f:fe::_48 b/data/inet6num/fdef:c0f:fe::_48 deleted file mode 100644 index 6716be3d4..000000000 --- a/data/inet6num/fdef:c0f:fe::_48 +++ /dev/null @@ -1,12 +0,0 @@ -inet6num: fdef:0c0f:00fe:0000:0000:0000:0000:0000 - fdef:0c0f:00fe:ffff:ffff:ffff:ffff:ffff -netname: NET-BODEMS-IP6-ULA -descr: Bodems IPv6 ULA-Net -nserver: ns0.bodems.dn42 -nserver: ns1.bodems.dn42 -country: DE -admin-c: BODEMS-DN42 -tech-c: BODEMS-DN42 -mnt-by: BODEMS-MNT -status: ASSIGNED -cidr: fdef:c0f:fe::/48 -source: DN42 diff --git a/data/inetnum/172.23.146.0_24 b/data/inetnum/172.23.146.0_24 index 167d41645..d2ff59a97 100644 --- a/data/inetnum/172.23.146.0_24 +++ b/data/inetnum/172.23.146.0_24 @@ -1,9 +1,9 @@ inetnum: 172.23.146.0 - 172.23.146.255 -netname: NET-BODEMS-IP4-DN42 -descr: Bodems IPv4-Net +netname: NET-ACME-IP4-DN42 +descr: ACME Labs IPv4-Net country: DE -nserver: ns0.bodems.dn42 -nserver: ns1.bodems.dn42 +nserver: rt-core.acmelabs.dn42 +org: ORG-ACME admin-c: BODEMS-DN42 tech-c: BODEMS-DN42 mnt-by: BODEMS-MNT diff --git a/data/inetnum/172.23.45.0_24 b/data/inetnum/172.23.45.0_24 deleted file mode 100644 index 3d542297c..000000000 --- a/data/inetnum/172.23.45.0_24 +++ /dev/null @@ -1,11 +0,0 @@ -inetnum: 172.23.45.0 - 172.23.45.255 -netname: HSB-ORG-NET4 -descr: Hackerspace Bielefeld e.V. -nserver: rt-core.hsb.dn42 -country: DE -admin-c: BODEMS-DN42 -tech-c: BODEMS-DN42 -mnt-by: BODEMS-MNT -status: ASSIGNED -cidr: 172.23.45.0/24 -source: DN42 diff --git a/data/mntner/BODEMS-MNT b/data/mntner/BODEMS-MNT index 71dd06a94..d2633fa4b 100644 --- a/data/mntner/BODEMS-MNT +++ b/data/mntner/BODEMS-MNT @@ -2,4 +2,5 @@ mntner: BODEMS-MNT admin-c: BODEMS-DN42 tech-c: BODEMS-DN42 mnt-by: BODEMS-MNT +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYnK3XiryLDH7uLptmrzRUA/bP3/1C0mrDdVECnss/tZxWePQh7hXC0W7AIkrW4ZUWBc9cRfgy1XdQFVcDiIdh5f9NoAM0ZdG7gX/OBzUw5smJjZAcLCFPcLV48MAAO4KyD1lTi+ZSHQmmAX/y372yUnRgwaka1VmLyqFdR0VdJ1EJAiQAbf4jOHYkGNIxFAB1lq6zOD4ejBzIhEAuUDB34Y/uBA+GKN1gtYUE1f94Ne8o640SdG2W93qI6KSJ2Bcv8oBxesQYGo/pLLFvm9VKPqQd5d9/p/3+1ySo1FcDAb6hTo0KQWJ/a9DkXLb0LH0iFk/7jAvs6fEtpfynXdZBIwYbRUUfD1gQxBlKcQrJ4711+tSoYg/KGfvOH3eUHkElQqCt1H1KassapbjjkTv6SyqpBeDcZ3zocl/zG2/+C24NtTCWlsw00+2PwMnKwNZf2L3gp7wzpOXNiTEJkNlYz+fbGHeID7CocLP1i48vbUOTsvutItRI/qoRCTLPtAS9R4zrdml4y0aMIRif3HgX8UinaQ1MtIo57MbKxzJPDmLh5D4d6LgSIi3N+lFYJcsWdVjbn3A3H616496CU0ehujdNCLFad+EQ11KBBZnAUuEjMM/ge3rpXCwcR6PvjQb8jXqZzXhfpbzn8wSg2rTzi4Fp+yrf5+sJu0PaJCh4rQ== bodems@wopr source: DN42 diff --git a/data/organisation/ORG-ACME b/data/organisation/ORG-ACME new file mode 100644 index 000000000..0f8ed1371 --- /dev/null +++ b/data/organisation/ORG-ACME @@ -0,0 +1,8 @@ +organisation: ORG-ACME +org-name: ACME Labs e.V. +descr: ACME Labs e.V. +www: https://acmelabs.space +admin-c: BODEMS-DN42 +tech-c: BODEMS-DN42 +mnt-by: BODEMS-MNT +source: DN42 diff --git a/data/organisation/ORG-HSB b/data/organisation/ORG-HSB deleted file mode 100644 index 6f6ac35f9..000000000 --- a/data/organisation/ORG-HSB +++ /dev/null @@ -1,8 +0,0 @@ -organisation: ORG-HSB -org-name: Hackerspace Bielefeld e.V. -descr: Hackerspace Bielefeld e.V. -www: https://hackerspace-bielefeld.de -admin-c: BODEMS-DN42 -tech-c: BODEMS-DN42 -mnt-by: BODEMS-MNT -source: DN42 diff --git a/data/person/BODEMS-DN42 b/data/person/BODEMS-DN42 index dc6dca4a1..94288e748 100644 --- a/data/person/BODEMS-DN42 +++ b/data/person/BODEMS-DN42 @@ -1,5 +1,4 @@ person: bodems -contact: XMPP: bodems@jabber.space.bi e-mail: dn42@bodems.net nic-hdl: BODEMS-DN42 mnt-by: BODEMS-MNT diff --git a/data/route/172.23.146.0_24 b/data/route/172.23.146.0_24 index 36a2ca248..d35b885fc 100644 --- a/data/route/172.23.146.0_24 +++ b/data/route/172.23.146.0_24 @@ -1,5 +1,5 @@ route: 172.23.146.0/24 -descr: Bodems IPv4 -origin: AS76124 +descr: ACME Labs IPv4 +origin: AS4242421833 mnt-by: BODEMS-MNT source: DN42 diff --git a/data/route/172.23.45.0_24 b/data/route/172.23.45.0_24 deleted file mode 100644 index c72af6dce..000000000 --- a/data/route/172.23.45.0_24 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.23.45.0/24 -descr: Hackerspace Bielefeld IPv4 -origin: AS4242423342 -mnt-by: BODEMS-MNT -source: DN42 diff --git a/data/route6/fd74:40ee:b38a::_48 b/data/route6/fd74:40ee:b38a::_48 deleted file mode 100644 index d26ba0f3d..000000000 --- a/data/route6/fd74:40ee:b38a::_48 +++ /dev/null @@ -1,5 +0,0 @@ -route6: fd74:40ee:b38a::/48 -descr: Hackerspace Bielefeld IPv6 ULA -origin: AS4242423342 -mnt-by: BODEMS-MNT -source: DN42 diff --git a/data/route6/fddf:3897:eab6::_48 b/data/route6/fddf:3897:eab6::_48 new file mode 100644 index 000000000..070c70a3f --- /dev/null +++ b/data/route6/fddf:3897:eab6::_48 @@ -0,0 +1,5 @@ +route6: fddf:3897:eab6::/48 +descr: ACME Labs IPv6 ULA +origin: AS4242421833 +mnt-by: BODEMS-MNT +source: DN42 diff --git a/data/route6/fdef:c0f:fe::_48 b/data/route6/fdef:c0f:fe::_48 deleted file mode 100644 index 8e8e20909..000000000 --- a/data/route6/fdef:c0f:fe::_48 +++ /dev/null @@ -1,5 +0,0 @@ -route6: fdef:c0f:fe::/48 -descr: Bodems IPv6 ULA-Net -origin: AS76124 -mnt-by: BODEMS-MNT -source: DN42