From b9c4e9d023fb63180362f14c09785ed345157a3f Mon Sep 17 00:00:00 2001 From: CHRiSNEW Date: Tue, 13 Feb 2018 23:10:17 +0100 Subject: [PATCH 1/2] some spring cleaning Signed-off-by: CHRiSNEW --- data/aut-num/AS4242422950 | 13 ++++++------- data/dns/2950.dn42 | 5 +++-- data/dns/brei.dn42 | 3 ++- data/dns/cr.dn42 | 5 +++-- data/dns/saturn.dn42 | 3 ++- data/dns/sis.dn42 | 8 ++++++++ data/dns/storage.dn42 | 2 +- data/inet6num/fd42:2950::_32 | 9 ++++++--- data/inetnum/10.50.0.0_16 | 2 +- data/inetnum/10.83.0.0_16 | 2 +- data/inetnum/172.23.119.176_28 | 9 ++++----- data/inetnum/172.23.234.192_27 | 8 +++++--- data/inetnum/172.23.38.160_27 | 12 ++++++++---- data/mntner/SIS-MNT | 6 ++++++ data/mntner/SIS-ORG-MNT | 7 ------- data/organisation/ORG-SIS | 10 ++++++++++ data/person/CR-DN42 | 2 +- data/route/10.50.0.0_16 | 2 +- data/route/10.83.0.0_16 | 2 +- data/route/172.23.119.176_28 | 4 ++-- data/route/172.23.234.192_27 | 4 ++-- data/route/172.23.38.160_27 | 4 ++-- data/route6/fd42:2950:0:6600::_56 | 5 ----- data/route6/fd42:2950:101::_48 | 4 ++++ data/route6/fd42:2950:201::_48 | 4 ++++ data/route6/fd42:2950:202::_48 | 4 ++++ data/route6/fd42:2950::_32 | 2 +- data/route6/fd42:2950::_48 | 4 ++++ data/route6/fd42:2950::_56 | 4 ---- 29 files changed, 92 insertions(+), 57 deletions(-) create mode 100644 data/dns/sis.dn42 create mode 100644 data/mntner/SIS-MNT delete mode 100644 data/mntner/SIS-ORG-MNT create mode 100644 data/organisation/ORG-SIS delete mode 100644 data/route6/fd42:2950:0:6600::_56 create mode 100644 data/route6/fd42:2950:101::_48 create mode 100644 data/route6/fd42:2950:201::_48 create mode 100644 data/route6/fd42:2950:202::_48 create mode 100644 data/route6/fd42:2950::_48 delete mode 100644 data/route6/fd42:2950::_56 diff --git a/data/aut-num/AS4242422950 b/data/aut-num/AS4242422950 index 365f45ed9..3eaeffcd2 100644 --- a/data/aut-num/AS4242422950 +++ b/data/aut-num/AS4242422950 @@ -1,10 +1,9 @@ aut-num: AS4242422950 -as-name: SISNET -descr: SIS DN42 ASN +as-name: SIS-DN42 +descr: SIS DN42 AS admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT -remarks: Peer with us! Contact admin-c for peering. -remarks: Nuremberg, Germany. 1 GBit/s uplink. -remarks: Inter-connected with franken.freifunk.net. -remarks: Providing email, servers and website hosting. +mnt-by: SIS-MNT +org: ORG-SIS +remarks: open for peerings, please contact admin-c +remarks: WireGuard/GRE+IPsec only diff --git a/data/dns/2950.dn42 b/data/dns/2950.dn42 index 3885aeb8c..82f16df52 100644 --- a/data/dns/2950.dn42 +++ b/data/dns/2950.dn42 @@ -1,6 +1,7 @@ domain: 2950.dn42 admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT +org: ORG-SIS nserver: ns.2950.dn42 172.23.234.200 -status: EVALPEND 1503915410 +status: CONNECT diff --git a/data/dns/brei.dn42 b/data/dns/brei.dn42 index d69a90a65..2bd27017a 100644 --- a/data/dns/brei.dn42 +++ b/data/dns/brei.dn42 @@ -1,6 +1,7 @@ domain: brei.dn42 admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT +org: ORG-SIS nserver: ns.2950.dn42 status: CONNECT diff --git a/data/dns/cr.dn42 b/data/dns/cr.dn42 index f61bdd35f..526b27088 100644 --- a/data/dns/cr.dn42 +++ b/data/dns/cr.dn42 @@ -1,6 +1,7 @@ domain: cr.dn42 admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT +org: ORG-SIS nserver: ns.2950.dn42 -status: EVALPEND 1503916020 +status: CONNECT diff --git a/data/dns/saturn.dn42 b/data/dns/saturn.dn42 index 4269f25a6..51bde3abd 100644 --- a/data/dns/saturn.dn42 +++ b/data/dns/saturn.dn42 @@ -1,6 +1,7 @@ domain: saturn.dn42 admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT +org: ORG-SIS nserver: ns.2950.dn42 status: CONNECT diff --git a/data/dns/sis.dn42 b/data/dns/sis.dn42 new file mode 100644 index 000000000..087edc3e6 --- /dev/null +++ b/data/dns/sis.dn42 @@ -0,0 +1,8 @@ +domain: sis.dn42 +admin-c: CR-DN42 +tech-c: CR-DN42 +mnt-by: SIS-MNT +org: ORG-SIS +nserver: ns.sis.dn42 fd42:2950::53 +nserver: ns.sis.dn42 172.23.234.200 +status: CONNECT diff --git a/data/dns/storage.dn42 b/data/dns/storage.dn42 index 54ba2f736..dbbf4b0de 100644 --- a/data/dns/storage.dn42 +++ b/data/dns/storage.dn42 @@ -1,6 +1,6 @@ domain: storage.dn42 admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT nserver: ns.2950.dn42 status: CONNECT diff --git a/data/inet6num/fd42:2950::_32 b/data/inet6num/fd42:2950::_32 index ea3d2739b..464ef021a 100644 --- a/data/inet6num/fd42:2950::_32 +++ b/data/inet6num/fd42:2950::_32 @@ -1,8 +1,11 @@ -inet6num: fd42:2950:0:0:0:0:0:0 - fd42:2950:ffff:ffff:ffff:ffff:ffff:ffff +inet6num: fd42:2950:0000:0000:0000:0000:0000:0000-fd42:2950:ffff:ffff:ffff:ffff:ffff:ffff netname: SIS-DN42-INET6 -descr: SIS DN42 v6 Space +descr: SIS DN42 IPv6 admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT +org: ORG-SIS status: ASSIGNED cidr: fd42:2950::/32 +nserver: ns.sis.dn42 fd42:2950::53 +nserver: ns.sis.dn42 172.23.234.200 diff --git a/data/inetnum/10.50.0.0_16 b/data/inetnum/10.50.0.0_16 index 7726d3d76..4da094ff4 100644 --- a/data/inetnum/10.50.0.0_16 +++ b/data/inetnum/10.50.0.0_16 @@ -2,7 +2,7 @@ inetnum: 10.50.0.0 - 10.50.255.255 remarks: ** franken admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT status: ALLOCATED nserver: ns1.franken.g.nic.dn42 nserver: ns2.franken.g.nic.dn42 diff --git a/data/inetnum/10.83.0.0_16 b/data/inetnum/10.83.0.0_16 index 8a5b7dcf3..7dc7d6df2 100644 --- a/data/inetnum/10.83.0.0_16 +++ b/data/inetnum/10.83.0.0_16 @@ -2,7 +2,7 @@ inetnum: 10.83.0.0 - 10.83.255.255 remarks: ** franken admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT status: ALLOCATED nserver: ns1.franken.g.nic.dn42 nserver: ns2.franken.g.nic.dn42 diff --git a/data/inetnum/172.23.119.176_28 b/data/inetnum/172.23.119.176_28 index e89492786..9aba1d616 100644 --- a/data/inetnum/172.23.119.176_28 +++ b/data/inetnum/172.23.119.176_28 @@ -1,10 +1,9 @@ inetnum: 172.23.119.176 - 172.23.119.191 -netname: SIS-DN42-VPN-1 -remarks: if you see strange traffic, please contact us immediately -descr: roaming end user devices -country: DE +netname: SIS-DN42-INET4-VPN1 +descr: VPN clients admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT +org: ORG-SIS status: ASSIGNED cidr: 172.23.119.176/28 diff --git a/data/inetnum/172.23.234.192_27 b/data/inetnum/172.23.234.192_27 index 27d182412..d68e00e18 100644 --- a/data/inetnum/172.23.234.192_27 +++ b/data/inetnum/172.23.234.192_27 @@ -1,9 +1,11 @@ inetnum: 172.23.234.192 - 172.23.234.223 -netname: SIS-DN42-PHOBOS -descr: hosted servers +netname: SIS-DN42-INET4-BLK1 +descr: legacy IP block 1 country: DE admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT +org: ORG-SIS status: ASSIGNED cidr: 172.23.234.192/27 +nserver: ns.sis.dn42 diff --git a/data/inetnum/172.23.38.160_27 b/data/inetnum/172.23.38.160_27 index e260c69ed..3102af2fd 100644 --- a/data/inetnum/172.23.38.160_27 +++ b/data/inetnum/172.23.38.160_27 @@ -1,9 +1,13 @@ inetnum: 172.23.38.160 - 172.23.38.191 -netname: SISNET-EASY42-INET4 -descr: open dn42 access -country: DE +netname: SIS-DN42-INET4-LAB1 +descr: laboratory network +remarks: please consider the following: +remarks: - this network is not always online +remarks: - might also be used for demonstration purposes on events or in public +remarks: - clients are assigned by dhcp admin-c: CR-DN42 tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT +org: ORG-SIS status: ASSIGNED cidr: 172.23.38.160/27 diff --git a/data/mntner/SIS-MNT b/data/mntner/SIS-MNT new file mode 100644 index 000000000..f84ffcbe4 --- /dev/null +++ b/data/mntner/SIS-MNT @@ -0,0 +1,6 @@ +mntner: SIS-MNT +descr: SIS DN42 +abuse-mailbox: hostmaster+abuse@smartinternet.eu +admin-c: CR-DN42 +tech-c: CR-DN42 +mnt-by: SIS-MNT diff --git a/data/mntner/SIS-ORG-MNT b/data/mntner/SIS-ORG-MNT deleted file mode 100644 index 96ec7193d..000000000 --- a/data/mntner/SIS-ORG-MNT +++ /dev/null @@ -1,7 +0,0 @@ -mntner: SIS-ORG-MNT -descr: SIS DN42 -abuse-mailbox: hostmaster+abuse@smartinternet.eu -sha512-pw: MGMxMDA1MTFjYzkwNTQyNzA5ZGEwMDBkMzIwYzhmYWNmYWM4ZDVlNWI2MWMxYWFiYzExNzA0OWI0NzU1ODQwYzFkYzI2YjM4MDU1ZWYyNmI3MzQ0ZTk4MTZlYjI5NzNiNmRkYTU2YjA1MmNiODU1NTk5ZmUxNDM3ODQ5NWNiMDBlOGYxMmM0YmExNGNkZTcwY2I3NmMyYzlmNTBmYjBhMDczZWU4ODAzOGI2YzAwOTY3OGEwMGVlZTkwMjk1ZWMyZGYwMTJhZDMyZTE2YTljNTQ2YWExZTI3NWNlODlmNmMyODA2Y2Q5NzIyN2FlNTE4YmRlNDNkYjM4MWEzNjU2ZmJkOGRhMTkwYjQ0NDE5YzdhNjFkY2QyZmVkZmNjYTE3ZGU4ZGE1YjUwZDIxOGFhNDI4MDZkNWQ3NDE1N2I5YTQzYjg2ZGZkM2NhZDE4NjAxN2ZlNGMyZTE3ZDNjZDI0NTU4NDk1ZWMzNzQ2YTk1YmI2OTVhZWY4MTE0ZjI1NjNjNDcxN2MzMWNiZjBhN2M3NmI1OTI3M2VkOTdmOWU2Y2VkNmE2OGJkZDcwZWNkMjE3MWRmNGFmMWM2OTc1ZmY1NmRlMzA5NjI1NWM4NDIwNDMyYmI2YjhiMzQ1M2EzNjQyZDE4ODZiYjcwOTRjZGFiY2JhZTM5ODNlOGM1M2NlMDI= -admin-c: CR-DN42 -tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT diff --git a/data/organisation/ORG-SIS b/data/organisation/ORG-SIS new file mode 100644 index 000000000..a12f87670 --- /dev/null +++ b/data/organisation/ORG-SIS @@ -0,0 +1,10 @@ +organisation: ORG-SIS +org-name: Smart Internet Solutions +address: Nuremberg, Germany +language: DE +www: https://smartinternet.eu +abuse-mailbox: hostmaster+abuse@smartinternet.eu +admin-c: CR-DN42 +tech-c: CR-DN42 +abuse-c: CR-DN42 +mnt-by: SIS-MNT diff --git a/data/person/CR-DN42 b/data/person/CR-DN42 index bae1c3ec3..13a3e9ee1 100644 --- a/data/person/CR-DN42 +++ b/data/person/CR-DN42 @@ -6,4 +6,4 @@ abuse-mailbox: dn42-abuse@chrisnew.de pgp-fingerprint: 6EEA5884091B6DC84DF44B851B11FF897AC1EED7 pgp-fingerprint: CE0E2E08457FD22CC05E53976BF0C51BE5163380 nic-hdl: CR-DN42 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT diff --git a/data/route/10.50.0.0_16 b/data/route/10.50.0.0_16 index 69e7b7b6f..a4b43dfaf 100644 --- a/data/route/10.50.0.0_16 +++ b/data/route/10.50.0.0_16 @@ -1,5 +1,5 @@ route: 10.50.0.0/16 descr: FF Franken origin: AS4242422950 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT tech-c: CR-DN42 diff --git a/data/route/10.83.0.0_16 b/data/route/10.83.0.0_16 index fdcab1bdc..2dff4afe3 100644 --- a/data/route/10.83.0.0_16 +++ b/data/route/10.83.0.0_16 @@ -1,5 +1,5 @@ route: 10.83.0.0/16 descr: FF Franken origin: AS4242422950 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT tech-c: CR-DN42 diff --git a/data/route/172.23.119.176_28 b/data/route/172.23.119.176_28 index d2ca0a9f2..854ea8d76 100644 --- a/data/route/172.23.119.176_28 +++ b/data/route/172.23.119.176_28 @@ -1,4 +1,4 @@ route: 172.23.119.176/28 -descr: SIS-DN42-VPN-1 +descr: SIS-DN42-INET4-VPN1 origin: AS4242422950 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT diff --git a/data/route/172.23.234.192_27 b/data/route/172.23.234.192_27 index 739c201ab..371715de3 100644 --- a/data/route/172.23.234.192_27 +++ b/data/route/172.23.234.192_27 @@ -1,4 +1,4 @@ route: 172.23.234.192/27 -descr: SIS-DN42-PHOBOS +descr: SIS-DN42-INET4-BLK1 origin: AS4242422950 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT diff --git a/data/route/172.23.38.160_27 b/data/route/172.23.38.160_27 index 441a3b00b..34826ca40 100644 --- a/data/route/172.23.38.160_27 +++ b/data/route/172.23.38.160_27 @@ -1,4 +1,4 @@ route: 172.23.38.160/27 -descr: SISNET-EASY42-INET4 +descr: SIS-DN42-INET4-LAB1 origin: AS4242422950 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT diff --git a/data/route6/fd42:2950:0:6600::_56 b/data/route6/fd42:2950:0:6600::_56 deleted file mode 100644 index edac2be9a..000000000 --- a/data/route6/fd42:2950:0:6600::_56 +++ /dev/null @@ -1,5 +0,0 @@ -route6: fd42:2950:0:6600::/56 -descr: SIS-DN42-PHOBOS -remarks: fugly NPTv6 -origin: AS4242422950 -mnt-by: SIS-ORG-MNT diff --git a/data/route6/fd42:2950:101::_48 b/data/route6/fd42:2950:101::_48 new file mode 100644 index 000000000..1de9da39f --- /dev/null +++ b/data/route6/fd42:2950:101::_48 @@ -0,0 +1,4 @@ +route6: fd42:2950:101::/48 +descr: SIS-DN42-INET6-LAB1 route +origin: AS4242422950 +mnt-by: SIS-MNT diff --git a/data/route6/fd42:2950:201::_48 b/data/route6/fd42:2950:201::_48 new file mode 100644 index 000000000..d2f9339af --- /dev/null +++ b/data/route6/fd42:2950:201::_48 @@ -0,0 +1,4 @@ +route6: fd42:2950:201::/48 +descr: SIS-DN42-INET6-BLK1 route +origin: AS4242422950 +mnt-by: SIS-MNT diff --git a/data/route6/fd42:2950:202::_48 b/data/route6/fd42:2950:202::_48 new file mode 100644 index 000000000..d03595eb4 --- /dev/null +++ b/data/route6/fd42:2950:202::_48 @@ -0,0 +1,4 @@ +route6: fd42:2950:202::/48 +descr: SIS-DN42-INET6-BLK2 route +origin: AS4242422950 +mnt-by: SIS-MNT diff --git a/data/route6/fd42:2950::_32 b/data/route6/fd42:2950::_32 index 58e502058..22ea58503 100644 --- a/data/route6/fd42:2950::_32 +++ b/data/route6/fd42:2950::_32 @@ -1,4 +1,4 @@ route6: fd42:2950::/32 descr: SIS-DN42 aggregated origin: AS4242422950 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT diff --git a/data/route6/fd42:2950::_48 b/data/route6/fd42:2950::_48 new file mode 100644 index 000000000..ef00afe4c --- /dev/null +++ b/data/route6/fd42:2950::_48 @@ -0,0 +1,4 @@ +route6: fd42:2950::/48 +descr: SIS-DN42-INET6-MISC route +origin: AS4242422950 +mnt-by: SIS-MNT diff --git a/data/route6/fd42:2950::_56 b/data/route6/fd42:2950::_56 deleted file mode 100644 index 35a99f659..000000000 --- a/data/route6/fd42:2950::_56 +++ /dev/null @@ -1,4 +0,0 @@ -route6: fd42:2950::/56 -descr: SIS-DN42-PHOBOS -origin: AS4242422950 -mnt-by: SIS-ORG-MNT From 5421df854aba46bc8b13c643a484189fe945b428 Mon Sep 17 00:00:00 2001 From: CHRiSNEW Date: Wed, 14 Feb 2018 18:41:41 +0100 Subject: [PATCH 2/2] removed old stuff Signed-off-by: CHRiSNEW --- data/mntner/SIS-ORG-MNT | 8 -------- data/route6/fd42:2950:0:6600::_56 | 6 ------ data/route6/fd42:2950::_56 | 5 ----- 3 files changed, 19 deletions(-) delete mode 100644 data/mntner/SIS-ORG-MNT delete mode 100644 data/route6/fd42:2950:0:6600::_56 delete mode 100644 data/route6/fd42:2950::_56 diff --git a/data/mntner/SIS-ORG-MNT b/data/mntner/SIS-ORG-MNT deleted file mode 100644 index 17f85eebb..000000000 --- a/data/mntner/SIS-ORG-MNT +++ /dev/null @@ -1,8 +0,0 @@ -mntner: SIS-ORG-MNT -descr: SIS DN42 -abuse-mailbox: hostmaster+abuse@smartinternet.eu -sha512-pw: MGMxMDA1MTFjYzkwNTQyNzA5ZGEwMDBkMzIwYzhmYWNmYWM4ZDVlNWI2MWMxYWFiYzExNzA0OWI0NzU1ODQwYzFkYzI2YjM4MDU1ZWYyNmI3MzQ0ZTk4MTZlYjI5NzNiNmRkYTU2YjA1MmNiODU1NTk5ZmUxNDM3ODQ5NWNiMDBlOGYxMmM0YmExNGNkZTcwY2I3NmMyYzlmNTBmYjBhMDczZWU4ODAzOGI2YzAwOTY3OGEwMGVlZTkwMjk1ZWMyZGYwMTJhZDMyZTE2YTljNTQ2YWExZTI3NWNlODlmNmMyODA2Y2Q5NzIyN2FlNTE4YmRlNDNkYjM4MWEzNjU2ZmJkOGRhMTkwYjQ0NDE5YzdhNjFkY2QyZmVkZmNjYTE3ZGU4ZGE1YjUwZDIxOGFhNDI4MDZkNWQ3NDE1N2I5YTQzYjg2ZGZkM2NhZDE4NjAxN2ZlNGMyZTE3ZDNjZDI0NTU4NDk1ZWMzNzQ2YTk1YmI2OTVhZWY4MTE0ZjI1NjNjNDcxN2MzMWNiZjBhN2M3NmI1OTI3M2VkOTdmOWU2Y2VkNmE2OGJkZDcwZWNkMjE3MWRmNGFmMWM2OTc1ZmY1NmRlMzA5NjI1NWM4NDIwNDMyYmI2YjhiMzQ1M2EzNjQyZDE4ODZiYjcwOTRjZGFiY2JhZTM5ODNlOGM1M2NlMDI= -admin-c: CR-DN42 -tech-c: CR-DN42 -mnt-by: SIS-ORG-MNT -source: DN42 diff --git a/data/route6/fd42:2950:0:6600::_56 b/data/route6/fd42:2950:0:6600::_56 deleted file mode 100644 index b9f95894b..000000000 --- a/data/route6/fd42:2950:0:6600::_56 +++ /dev/null @@ -1,6 +0,0 @@ -route6: fd42:2950:0:6600::/56 -descr: SIS-DN42-PHOBOS -remarks: fugly NPTv6 -origin: AS4242422950 -mnt-by: SIS-ORG-MNT -source: DN42 diff --git a/data/route6/fd42:2950::_56 b/data/route6/fd42:2950::_56 deleted file mode 100644 index 30db36a22..000000000 --- a/data/route6/fd42:2950::_56 +++ /dev/null @@ -1,5 +0,0 @@ -route6: fd42:2950::/56 -descr: SIS-DN42-PHOBOS -origin: AS4242422950 -mnt-by: SIS-ORG-MNT -source: DN42