diff --git a/data/aut-num/AS4242422950 b/data/aut-num/AS4242422950 index dcbf75ba6..ec4672aee 100644 --- a/data/aut-num/AS4242422950 +++ b/data/aut-num/AS4242422950 @@ -1,11 +1,10 @@ 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 source: DN42 diff --git a/data/dns/2950.dn42 b/data/dns/2950.dn42 index 8d9ced68e..3400dd56e 100644 --- a/data/dns/2950.dn42 +++ b/data/dns/2950.dn42 @@ -1,7 +1,8 @@ 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 source: DN42 diff --git a/data/dns/brei.dn42 b/data/dns/brei.dn42 index edb8c2064..869d75b03 100644 --- a/data/dns/brei.dn42 +++ b/data/dns/brei.dn42 @@ -1,7 +1,8 @@ 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 source: DN42 diff --git a/data/dns/cr.dn42 b/data/dns/cr.dn42 index 6bc1fdad0..850699482 100644 --- a/data/dns/cr.dn42 +++ b/data/dns/cr.dn42 @@ -1,7 +1,8 @@ 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 source: DN42 diff --git a/data/dns/saturn.dn42 b/data/dns/saturn.dn42 index a85c3c29f..f536c449f 100644 --- a/data/dns/saturn.dn42 +++ b/data/dns/saturn.dn42 @@ -1,7 +1,8 @@ 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 source: DN42 diff --git a/data/dns/sis.dn42 b/data/dns/sis.dn42 new file mode 100644 index 000000000..7222aa63f --- /dev/null +++ b/data/dns/sis.dn42 @@ -0,0 +1,9 @@ +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 +source: DN42 diff --git a/data/dns/storage.dn42 b/data/dns/storage.dn42 index 320b1c6e4..263ece7da 100644 --- a/data/dns/storage.dn42 +++ b/data/dns/storage.dn42 @@ -1,7 +1,7 @@ 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 source: DN42 diff --git a/data/inet6num/fd42:2950::_32 b/data/inet6num/fd42:2950::_32 index ba21b9c9f..fc7059ac4 100644 --- a/data/inet6num/fd42:2950::_32 +++ b/data/inet6num/fd42:2950::_32 @@ -1,9 +1,12 @@ -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 source: DN42 diff --git a/data/inetnum/10.50.0.0_16 b/data/inetnum/10.50.0.0_16 index 46249f63d..3b28f463f 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 6627512b8..207c7c08b 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 f6fc34585..837d86652 100644 --- a/data/inetnum/172.23.119.176_28 +++ b/data/inetnum/172.23.119.176_28 @@ -1,11 +1,10 @@ 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 source: DN42 diff --git a/data/inetnum/172.23.234.192_27 b/data/inetnum/172.23.234.192_27 index 1d2124dff..faa83f949 100644 --- a/data/inetnum/172.23.234.192_27 +++ b/data/inetnum/172.23.234.192_27 @@ -1,10 +1,12 @@ 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 source: DN42 diff --git a/data/inetnum/172.23.38.160_27 b/data/inetnum/172.23.38.160_27 index 3e94bfe20..46d1b2e82 100644 --- a/data/inetnum/172.23.38.160_27 +++ b/data/inetnum/172.23.38.160_27 @@ -1,10 +1,14 @@ 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 source: DN42 diff --git a/data/mntner/SIS-MNT b/data/mntner/SIS-MNT new file mode 100644 index 000000000..f1717c326 --- /dev/null +++ b/data/mntner/SIS-MNT @@ -0,0 +1,7 @@ +mntner: SIS-MNT +descr: SIS DN42 +abuse-mailbox: hostmaster+abuse@smartinternet.eu +admin-c: CR-DN42 +tech-c: CR-DN42 +mnt-by: SIS-MNT +source: DN42 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/organisation/ORG-SIS b/data/organisation/ORG-SIS new file mode 100644 index 000000000..ee4125f54 --- /dev/null +++ b/data/organisation/ORG-SIS @@ -0,0 +1,11 @@ +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 +source: DN42 diff --git a/data/person/CR-DN42 b/data/person/CR-DN42 index 9a5097b3d..8f264a5a4 100644 --- a/data/person/CR-DN42 +++ b/data/person/CR-DN42 @@ -6,5 +6,5 @@ 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 source: DN42 diff --git a/data/route/10.50.0.0_16 b/data/route/10.50.0.0_16 index a1b5f9954..8cbe95c9b 100644 --- a/data/route/10.50.0.0_16 +++ b/data/route/10.50.0.0_16 @@ -1,6 +1,6 @@ route: 10.50.0.0/16 descr: FF Franken origin: AS4242422950 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT tech-c: CR-DN42 source: ICVPN diff --git a/data/route/10.83.0.0_16 b/data/route/10.83.0.0_16 index 0ccf0c51b..1c6f70cd7 100644 --- a/data/route/10.83.0.0_16 +++ b/data/route/10.83.0.0_16 @@ -1,6 +1,6 @@ route: 10.83.0.0/16 descr: FF Franken origin: AS4242422950 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT tech-c: CR-DN42 source: ICVPN diff --git a/data/route/172.23.119.176_28 b/data/route/172.23.119.176_28 index e65f5a8c6..2f474f5fb 100644 --- a/data/route/172.23.119.176_28 +++ b/data/route/172.23.119.176_28 @@ -1,5 +1,5 @@ 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 source: DN42 diff --git a/data/route/172.23.234.192_27 b/data/route/172.23.234.192_27 index ef16b5a92..fd0075cac 100644 --- a/data/route/172.23.234.192_27 +++ b/data/route/172.23.234.192_27 @@ -1,5 +1,5 @@ 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 source: DN42 diff --git a/data/route/172.23.38.160_27 b/data/route/172.23.38.160_27 index 79ed3aedf..12699883d 100644 --- a/data/route/172.23.38.160_27 +++ b/data/route/172.23.38.160_27 @@ -1,5 +1,5 @@ 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 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:101::_48 b/data/route6/fd42:2950:101::_48 new file mode 100644 index 000000000..69333ac74 --- /dev/null +++ b/data/route6/fd42:2950:101::_48 @@ -0,0 +1,5 @@ +route6: fd42:2950:101::/48 +descr: SIS-DN42-INET6-LAB1 route +origin: AS4242422950 +mnt-by: SIS-MNT +source: DN42 diff --git a/data/route6/fd42:2950:201::_48 b/data/route6/fd42:2950:201::_48 new file mode 100644 index 000000000..7ec150a30 --- /dev/null +++ b/data/route6/fd42:2950:201::_48 @@ -0,0 +1,5 @@ +route6: fd42:2950:201::/48 +descr: SIS-DN42-INET6-BLK1 route +origin: AS4242422950 +mnt-by: SIS-MNT +source: DN42 diff --git a/data/route6/fd42:2950:202::_48 b/data/route6/fd42:2950:202::_48 new file mode 100644 index 000000000..29c4af259 --- /dev/null +++ b/data/route6/fd42:2950:202::_48 @@ -0,0 +1,5 @@ +route6: fd42:2950:202::/48 +descr: SIS-DN42-INET6-BLK2 route +origin: AS4242422950 +mnt-by: SIS-MNT +source: DN42 diff --git a/data/route6/fd42:2950::_32 b/data/route6/fd42:2950::_32 index 9fbbf2d1d..bfcb7a3d1 100644 --- a/data/route6/fd42:2950::_32 +++ b/data/route6/fd42:2950::_32 @@ -1,5 +1,5 @@ route6: fd42:2950::/32 descr: SIS-DN42 aggregated origin: AS4242422950 -mnt-by: SIS-ORG-MNT +mnt-by: SIS-MNT source: DN42 diff --git a/data/route6/fd42:2950::_48 b/data/route6/fd42:2950::_48 new file mode 100644 index 000000000..de5cdc64e --- /dev/null +++ b/data/route6/fd42:2950::_48 @@ -0,0 +1,5 @@ +route6: fd42:2950::/48 +descr: SIS-DN42-INET6-MISC route +origin: AS4242422950 +mnt-by: SIS-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