diff --git a/data/route-set/RS-DN42 b/data/route-set/RS-DN42 deleted file mode 100644 index cc9386304..000000000 --- a/data/route-set/RS-DN42 +++ /dev/null @@ -1,17 +0,0 @@ -route-set: RS-DN42 -descr: extended dn42 networks -remarks: contains the native dn42 network and ICANN assigned PI/PA space -members: RS-DN42-NATIVE -mp-members: RS-DN42-NATIVE -members: 195.16.84.40/29 -mp-members: 195.16.84.40/29 -members: 37.1.89.160/29 -mp-members: 37.1.89.160/29 -members: 46.19.90.48/28 -mp-members: 46.19.90.48/28 -members: 46.19.90.96/28 -mp-members: 46.19.90.96/28 -members: 46.4.248.192/27 -mp-members: 46.4.248.192/27 -mnt-by: DN42-MNT -source: DN42 diff --git a/data/route-set/RS-DN42-NATIVE b/data/route-set/RS-DN42-NATIVE index 7d2bfecbf..9a05da753 100644 --- a/data/route-set/RS-DN42-NATIVE +++ b/data/route-set/RS-DN42-NATIVE @@ -2,6 +2,5 @@ route-set: RS-DN42-NATIVE descr: dn42 native networks mp-members: 172.20.0.0/14+ mp-members: fd00::/8+ -members: 172.20.0.0/14+ mnt-by: DN42-MNT source: DN42 diff --git a/data/schema/TINC-KEY-SCHEMA b/data/schema/TINC-KEY-SCHEMA deleted file mode 100644 index 89e2f235e..000000000 --- a/data/schema/TINC-KEY-SCHEMA +++ /dev/null @@ -1,18 +0,0 @@ -schema: TINC-KEY-SCHEMA -ref: dn42.tinc-key -dir-name: tinc-key -key: tinc-key required single primary schema -key: tinc-host required single -key: tinc-file required single -key: descr optional single -key: remarks optional multiple -key: compression optional single -key: subnet optional multiple -key: tinc-address optional single -key: port optional single -key: admin-c optional multiple lookup=dn42.person,dn42.role -key: tech-c optional multiple lookup=dn42.person,dn42.role -key: mnt-by required multiple lookup=dn42.mntner -key: source required single lookup=dn42.registry -mnt-by: DN42-MNT -source: DN42 diff --git a/data/schema/TINC-KEYSET-SCHEMA b/data/schema/TINC-KEYSET-SCHEMA deleted file mode 100644 index 93c17a861..000000000 --- a/data/schema/TINC-KEYSET-SCHEMA +++ /dev/null @@ -1,13 +0,0 @@ -schema: TINC-KEYSET-SCHEMA -ref: dn42.tinc-keyset -dir-name: tinc-keyset -key: tinc-keyset required single primary schema -key: descr optional single -key: remarks optional multiple -key: member required multiple lookup=dn42.tinc-key -key: admin-c optional multiple lookup=dn42.person,dn42.role -key: tech-c optional multiple lookup=dn42.person,dn42.role -key: mnt-by required multiple lookup=dn42.mntner -key: source required single lookup=dn42.registry -mnt-by: DN42-MNT -source: DN42 diff --git a/data/tinc-key/ARIEL-TINC b/data/tinc-key/ARIEL-TINC deleted file mode 100644 index 7f8071b54..000000000 --- a/data/tinc-key/ARIEL-TINC +++ /dev/null @@ -1,17 +0,0 @@ -tinc-key: ARIEL-TINC -tinc-host: shack -tinc-file: - Compression=9 - Subnet=172.22.255.184/32 - Address=173.208.168.10 - Port=655 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAsw1Lu+J0vT7iYnb3mjVH/tpt3CRT/K+ut5NSFmzUgQcDy6cw+GJQ - p0qfwQgE2Y1uh7LjDCZNHKVH7reVJm4rbJaBxXdY72g+j/5qPo/3AS8v6hiayc1b - KU4Lcv6FI2wkEuOiTsTqA6aAZ+S7KnyBTdsGCEv9NnqPZHt0dt9r1OXrdp1fy8Z0 - W/LLegtSzadCj55mANdrAWjOuiDOvN+UQ33xWnDPVmZ6HlCPu8KGayQ+Mxtxr3au - Nqs9vmY3si/V8/XNFNBb8ODbGIEIreXiSVqXVzrRLHOnUUEs0Kfwjx8qQilB4Ou+ - r5RHMctskJOEHvrSFTVX1tzayzAB/qeU+wIDAQAB - -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/AS4242422703-TINC b/data/tinc-key/AS4242422703-TINC deleted file mode 100644 index fa14e7679..000000000 --- a/data/tinc-key/AS4242422703-TINC +++ /dev/null @@ -1,22 +0,0 @@ -tinc-key: AS4242422703-TINC -tinc-host: AS4242422703 -compression: 11 -mnt-by: STEVE81-MNT -admin-c: STEVE81-DN42 -subnet: 172.23.3.15/32 -tinc-address: 2.225.239.86 -port: 23117 -tinc-file: - Subnet = 172.23.3.15/32 - Address = 2.225.239.86 - Compression = 11 - Port = 23117 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAulMWBcvcsjXdBi7/YjrFC+KmZVs1YNzFdQY+0cEE4KkwYdTFJegH - w8YOmuJ+kLYcU7TIjYtBoz6xBD/OrlcatdAyjKzhJBUOAMITj4b80SzGoWT4I5HG - K8SlrS9OKHIYdb5rSajs22SV4LDjYpxWrbgH3IgjqXhFGLX6mCLhRi+kFDIcUD2Q - I/M9nDTlTMi/BaY/SZDTL5yqTv/54psiLn382VfPq+C2BjxeLNmKUp8c5XHffFYk - lyU9PjaIZqQ8csgrcL/XEBcs5Wz7kLnapLodJwS3/9GrH+OR3uk6ceWo5B/j1eic - K8HD1c+ieJxHUkPiQS6rIi6q1Pv9agdPEQIDAQAB - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/BLAZINGUS-TINC b/data/tinc-key/BLAZINGUS-TINC deleted file mode 100644 index 9c3a20e2f..000000000 --- a/data/tinc-key/BLAZINGUS-TINC +++ /dev/null @@ -1,26 +0,0 @@ -tinc-key: BLAZINGUS-TINC -tinc-host: us1_blazing -compression: 10 -descr: Blazing US -mnt-by: BLAZING-MNT -admin-c: TOBEE-DN42 -subnet: 172.23.67.8/32 -tinc-address: us-1.gerger-net.de -tinc-file: - Subnet = 172.23.67.8/32 - Address = us-1.gerger-net.de - Compression = 10 - -----BEGIN RSA PUBLIC KEY----- - MIICCgKCAgEAp4PQmwYDQzwsGC5KZC34w58oHCwc4LoBQXflJ38TZryfuleN1wJp - SuzLHhjtL5o9pSsyK+BvDcCpAq0JkpRFpUZXSxLULSLBbEANEHBxRY30fk5t8d6q - SoMgO3Jan+9BKkA35HDOqHpEJxrYtmIZJ33UdIc+BbGj88LGEzoEGLLo8Okcd5p9 - qhJ+fSBPam5W5Ys2xQvML10nyHtXB0BUGAB4PtG8679HEvyDzHgZ5JdTmJMZhRXz - b7TJuBEOa9TsI5oePwy5UOS0sEUwfZAHqFvs4kbFLr5Sr5jTLCYcRGhsnxgo0mP0 - V8UXKCtJw0alop86tRZi3uY3kIfiaTygShiIV2R9zlCDhH+MlDAglvAC380Bw9ad - Um43/uPd0pIM7NcgrOe4EnV27GyDOeGi/aJWU4XzwDSoWUHbMIY52EwdGf8s3QdJ - k7Ql26u5bZ2DdVZoXxU3+Eio6j2eRRarHsPeHpjnsq80QFsMOz2sF5D3ov8guevw - hlFMDFu1Xti5oqfgKb59dNAoIC5hV9VIchlV47ghdr8OmHegVa9Gj+nsl5z7mOQK - vb5qHVKhJU+LeYqD8igXUkfZo3s7mM6gug3GpNYEDtTlfY1oCjPKA2IfH9CBP8qH - LDBq3FMeI+sG70P9CMs6NkLwhdxNa5tgq8K7ZwtuVqUJsseUIoJVvMUCAwEAAQ== - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/DEELKAR-TINC b/data/tinc-key/DEELKAR-TINC deleted file mode 100644 index 2d63954b6..000000000 --- a/data/tinc-key/DEELKAR-TINC +++ /dev/null @@ -1,19 +0,0 @@ -tinc-key: DEELKAR-TINC -tinc-host: deelkar -remarks: * This object was generated based on info from legacy -remarks: * wiki and existing host files -compression: 9 -subnet: 172.22.255.187/32 -tinc-address: 83.169.16.132 -admin-c: DEELKAR-DN42 -mnt-by: DUMMY-MNT -tinc-file: - Subnet = 172.22.255.187/32 - Address = 83.169.16.132 - Compression = 9 - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAK8rXc+EvW+92XxQKaVX4n/JBgS0dq2jSq4So97W93JtRiMcy5hZCtL4 - sfnJ6TI19s2bL/AQjQvMBKouLr2ltEPdvVTWmZugHyp3VRjwG4rpi6nzovEUjSy/ - M0Dm0zZ6fSFoDnS7nD65AaR7ySS1QDxac0FWUqEoMqLz06uOSiaPAgMBAAE= - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/DEFIANTPORT2-TINC b/data/tinc-key/DEFIANTPORT2-TINC deleted file mode 100644 index 3d48eb94f..000000000 --- a/data/tinc-key/DEFIANTPORT2-TINC +++ /dev/null @@ -1,19 +0,0 @@ -tinc-key: DEFIANTPORT2-TINC -tinc-host: defiantport2 -tinc-file: - Subnet = 172.23.3.148/32 - -----BEGIN RSA PUBLIC KEY----- - MIICCgKCAgEAr+1zgiTwY6NXxKg6u99Hk8aSU10ApUAUZj/nVSv0fdfA2XXK6g75 - wp399H5cEkFOTkqoXlHjvyEIrMDhr525AJL8cCempmBYqmq1NhY1VlOkk+WZgEQ6 - GsdLJXL1rE0zboStyxE3IK5Pv27D+6BnVPYxZlMeD/X/IRcgGNoTwEJgqx14/9I6 - L1NaHekZdhS3F8WpkC98sJ2bZ4EECTtktBPTLIGp084dPQ3AySzxsCeBHg7+Apm4 - ual+vvB9+B7X/Sq9givRIyfBQZsoEdHohDLqqXxamd05rTu+PreuY1shiaL/sILD - +kPJU46YzchC4Aag9btDmcIj9G/tsdXeCfFppi0ZAE/rYj0PF+mB+raxgQxeGEqn - JF3HSFrKXW773OR4lvhOaM866JawlnQOkXbrrFH7LQhn5/f0OKhloaloR8mJ8D92 - pq0a2LH5N+y+idyQ1bhXaLuDDNRfsex+8pwuclgyrfarYqaRDx6vPMTrhKXbYyZr - 1Clai4r3tg841iAyYoMy+fG7PozebTyZn6DNKuTwG2Sy050RThr0VSi0wKXME+Lj - 3SFgXGESmJcqQEp7EZdOQXBMBX29496QvF9ket+AIplDbe9q8DC6EcRRH3Lahq4Y - GSrO9t7mKa6yEtLDBFbqKDAgwgsxh4l9EDqrMwIVSYbfcWLYgNIOpEsCAwEAAQ== - -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/DODGER78-TINC b/data/tinc-key/DODGER78-TINC deleted file mode 100644 index 7178d16a5..000000000 --- a/data/tinc-key/DODGER78-TINC +++ /dev/null @@ -1,17 +0,0 @@ -tinc-key: DODGER78-TINC -tinc-host: dodger78 -tinc-file: - Address=dsserver.homelinux.org - Port=657 - Subnet = fd04:de02:7af9:0000:dead:0000:fca0:1/128 - Compression = 11 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAwrug6RoT6FFfXt8PMbJ+V+KqPYC8lJp0MAnj71J6nPJ+jhYgkrZ+ - bXHMQo1XbqLi2eKV1nASrZijFgUdiRcNU2GSG9EYnu1a2hau9Sr96j3xdAw41gym - kiRCIAVvKKpMt7nCDtr67CrZ4bzkqXnrzoovxc73X9BZY0UND0xijwVqDaiuP8Oq - HsJfCqxK8+0Va/VBIGYe2mJU2sOzF0xehWi0TNoXwAE8fWg5/6FZtFZ08DCq1x7P - Stos+m7zfQWEJ6rHSq1Ut93jBlKlzwBle5qEmvH/whJ5cZC18LWPA6NynF0Ioel+ - 8GFqt0vRQcyd/kDUz0uEnDcESUGTNswsRwIDAQAB - -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/DOWNHILL-TINC b/data/tinc-key/DOWNHILL-TINC deleted file mode 100644 index 690c16b8b..000000000 --- a/data/tinc-key/DOWNHILL-TINC +++ /dev/null @@ -1,16 +0,0 @@ -tinc-key: DOWNHILL-TINC -tinc-host: geekhabitat -tinc-file: - Compression=9 - Subnet=172.22.255.177/32 - Address=88.198.175.17 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAwxY6ejnPrLES3rojV0ori0xWxaZU6yxleFv8d2S+z/9HlvZ7d6ZB - rjkDIWLOIC8C/fsl9MsS9r0SkAialFOQcT0RbbedM99vP9ERn1XeEZHMW59avGgD - Tp1JKi7c0IMVz4qGrdaA+IOYNxLxboohU4LgeDBriGfQFU0vx+s7tfz+fIyeJXmF - O2BI+ueJe8D6kvAZ/BiZmIHTg+Icj2TAcdZntiCGny2v1XvTuhbzV3FiOIMV7Nim - SE/IxPDoJ+Bp3IjlAaWKlVXptxVnMR41/t/aNYGlsOcwBr7gRZZExkG7wvKtWdYp - 4gWeRTqvWhiwt+T0OoFFZM0D1X4sS6/A1QIDAQAB - -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/FISHYSNAX-TINC b/data/tinc-key/FISHYSNAX-TINC deleted file mode 100644 index 00ec487f4..000000000 --- a/data/tinc-key/FISHYSNAX-TINC +++ /dev/null @@ -1,20 +0,0 @@ -tinc-key: FISHYSNAX-TINC -tinc-host: valeyard -tinc-file: - Subnet = 172.23.3.2/32 - Compression = 10 - -----BEGIN RSA PUBLIC KEY----- - MIICCgKCAgEArsSlw4dnwSmtBOzeRadmt+MNQa3O7O2MZ/vVRtL8pcF5KKeRJybO - sbIQq8AHauSI6cIeOsSHx6DmNlBAitoEScCEJa0FTX1lMRq8rmZlCK8C4/3RbKfy - FdE9Gt3qoAVLLqz/lENTy+yPGBFBXRfuPuads1/waPyqltPmtMu6/dO4vW/NOkRg - Vvvy5+WVpuy6HXMGaSNYHXO4fGJR0gexlVDoqr69iTbo+AShawsKk39X2FepyF+X - gIiek5jXl4EBnl8J9o9nHBZ4FytZsaypK9+9AODwgYePWKWVqVW9DbYrJ2gVqy/r - B/bmmR66gGcW/HiCLzsEWiCDnbxv4kbZMW0Z0+Vn8+kk1+Q6OdLCbew2EI4GKaXg - E7zMeQ2t98GCGge77xEWREnUYMBSnIWTgg7yTkiygdY7LeibwS+FuxeBr9rXDIVk - I3YRem4/Tudx5hxLstCNRZpubYKmVTP7gID6QSZ5C0Cc2URXD1a8wb951sZO5KpO - O9gom9GUqZaZGn8n1fULBinhHrq8h39Uh8BO1EGO/AziygcwGdOJKenm9gjBxcSe - ei92e7UVwT3+OOudqsOfOXa2IWtIXBtjRzkMeehUDkRGF8DzamqOUE1+DvW2esiN - Zv/yyBf2r53lBrCd3pPxF6cw9hVr4XzmD68/TVfdMfJCVTzfom9AO5UCAwEAAQ== - -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/FLONET-SITE1-TINC b/data/tinc-key/FLONET-SITE1-TINC deleted file mode 100644 index c4c8627d4..000000000 --- a/data/tinc-key/FLONET-SITE1-TINC +++ /dev/null @@ -1,25 +0,0 @@ -tinc-key: FLONET-SITE1-TINC -tinc-host: flonet -compression: 9 -mnt-by: DUMMY-MNT -subnet: 172.23.67.8/32 -tinc-address: flonet-rd.myownb3.com -port: 655 -tinc-file: - Address = flonet-rd.myownb3.com - Compression = 9 - Port = 655 - -----BEGIN RSA PUBLIC KEY----- - MIICCgKCAgEAn09zAh77VAOR6ewq3YUdSl8cKr+8tuhzUVrJitq9TrWPvUaCKWbF - 4lOGFUFwUnwkwQmeiuVk13Afhk2FLxOuImGx9UaG3eRu+o2vjPwxVzTRVlBMpKxH - pzIgt6dz9bl/19OHGRsdPBhCSEi7+wnj+fUQy5Vl88DS/5/8J7O7fSTcSYG8eslr - 6YuWQ9/QLKdVlPddduwwLhwZdT4Sdqg4P+z02czXu8kGt9xdgb18mPdCF9QQHYtv - uhf1eubyoc21My6Ys5wBBYv7rhA7iSNSZyOvZHVmfRJWLZNkUJYTvyUv2JM/PADT - c9U1ji2BrRMfXqVdCADnGmFaSgXeyynwHmFd4ZPhrxlRlCLZs6u6RQoamD9Q/Unn - qF2bAJt0Sbm9L0u7afU8IB5HeWCgKgRYwZ9bS7TvDTsTgfa5zuUoaYBpouhknIUX - PKtwgAXA+1F4E2Z/XokJIALbFMtumjnmRdyCR/XqIC3kBOGZ98VvLl/opnELWy8Z - W8abPJZbcEXD1lyIjmCq44ycu/Pph6RMNhNXZYP/jFIgECdAjeNx8GZaN4avkOR3 - PjomHmaEiuQXGP9pQAuvm9v4BqtYL82DGPj+AWv0mIfLCKev13aHiUxseRF2ssOL - R2WVRxGDFgC2HsITSVeAcue0F7+b854DD9T6EyUiVL7WjccpiGackgMCAwEAAQ== - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/HEX-TINC b/data/tinc-key/HEX-TINC deleted file mode 100644 index 5c1a81d4d..000000000 --- a/data/tinc-key/HEX-TINC +++ /dev/null @@ -1,21 +0,0 @@ -tinc-key: HEX-TINC -tinc-host: hex -compression: 0 -subnet: 172.22.255.179/32 -tinc-address: hex.srv.welterde.de -port: 656 -admin-c: WELTERDE-DN42 -mnt-by: DUMMY-MNT -tinc-file: - Subnet=172.22.255.179/32 - Address=hex.srv.welterde.de - Port=656 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAvDBkK+ctIqrkas+DAgwKMnHA2VA1tLN66JIWNXQjoTHrp0bzyjgJ - 80ZoOpHZPqTgkNkdgAwBiRXVxoLMvtJfv2YuibCk/ravUXx/OamKU+6IREwf9jNi - kttE5mdO/N+/3nnT+94ZJKpxJeTFV8S/rjjG1sd7qX/R6EspZvLtlJzC49SCK/3y - BPumRna2a4dd5yfpe9fHUB529uIAfm6r3zUq/IWO936IAwcfjPbDR5d0SBwTuMte - JOovmhbFFAYG6sOTP3eAzcO8ijoSUyIqbzMEV65icXLhSK+Rd0vV+S5JlLvhhlgo - Hl0gwEihSr7jN5SYZBoihkWVibZgMZUXewIDAQAB - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/MERLIN-TINC b/data/tinc-key/MERLIN-TINC deleted file mode 100644 index 37d8b8488..000000000 --- a/data/tinc-key/MERLIN-TINC +++ /dev/null @@ -1,17 +0,0 @@ -tinc-key: MERLIN-TINC -tinc-host: noc -tinc-file: - Address = 84.38.75.129 - Subnet = 172.22.255.194/32 - Subnet = fd04:de02:7af9:0:0:0:0:194/128 - Port=656 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAsn5Dr7hupkDpmEpQ9HU8ZNnV2wYvxUKVTT7ml1Az2QX8esnz+qlB - E8Lrpew/xWt6h339Gze6RBjnRibaWTbqHioPwzRm+juAuFQ/45DgmUgtIk0E/9dp - ubDPP6Eox1Cooz7W3MRiqReR0aMVNNNeVla3h1oMBXGprxlEZc5EszsPMPxRD38d - UdYMaeJZ9UzZY9C2Dke9ZtnJYSDzoXFPmXxQNE40fqHmOOPgc1QN1TY7qjlH0IYc - 2Vvm0Eg8Si1M+CfzBityH6mauBE/epLhOAd+pEpYQL420TVUUrcxOlU8y6PPCJLv - NcXVJk3DURkAkcHMzM/sbVyHs/VSUg0VowIDAQAB - -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/MNL-TINC b/data/tinc-key/MNL-TINC deleted file mode 100644 index 8c5d62d0d..000000000 --- a/data/tinc-key/MNL-TINC +++ /dev/null @@ -1,15 +0,0 @@ -tinc-key: MNL-TINC -tinc-host: aphrodite -compression: 9 -tinc-file: - Compression=9 -- optional - Subnet=172.22.255.182/32 - Address=80.244.247.134 - Port=655 - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAMsweu9/G5jfPnVVAJ6sRvgE/A59UGMylwlXvBVPYWxZqdyXkGT/aRj2 - Z72puZHbv0dhlgNmJYKmp2bhiHCS1YziKretnPedeK0XRFC/O8bccNKzwcG27lwK - umnknTN93qyuSjAv1EoDJSHenY6Gm9E7Tgysn4mSLcK3l5yeA1/JAgMBAAE= - -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/MTREMER-TINC b/data/tinc-key/MTREMER-TINC deleted file mode 100644 index 478695ee8..000000000 --- a/data/tinc-key/MTREMER-TINC +++ /dev/null @@ -1,23 +0,0 @@ -tinc-key: MTREMER-TINC -tinc-host: mtremer -admin-c: MTREMER-DN42 -tech-c: MTREMER-DN42 -tinc-address: tinc.tremer.co.uk -mnt-by: MTREMER-MNT -mnt-by: DUMMY-MNT -tinc-file: - Address = tinc.tremer.co.uk - -----BEGIN RSA PUBLIC KEY----- - MIICCgKCAgEAshNBXeV4ht/pzBmWF2IrJUwfjFbVVYXdTR73nWOCnhwglhPTNalH - lTZk8ngFnhMZSWsBrBx4Ik+ftHCPMKpSsoQNSUIicITDMkiLcUvKqSTaY71AiRPL - Ye/gAY8sw7zvKrKKqLm8TuIQUGk2SkQHlb0/hgLuc0PMQ7neYc0KUGM+6WP8xOQP - yrvHmfGknq8MTHP85AGDq871SRkjGwx8ybaUXNYroq1KFa5JMQ/c4lL9euIUbj8P - OoXYATve4PZiGGMn0Loa0LZq2vmnuAxm64i3/Q1EGL4EFA9mO9ULDatBZCO7zj6J - TdM4yeDcOOv0u6bZhQZRiFjqwolNAmEtapY54M1Ue8VU3y0/ADQWC3w/d0SbtHLy - yidpgRiSXiggoEJgSuCG8/KQqkr/VW/nrYO8ANmJmrn/k7tREBSuwhj9QhVDM4PT - F0VQyXL5+vu5t6BiN5LhvCkssnWn+RRJYRQz47m7qz1By2DVv8oRQxGx4QRPiwm7 - RzkwJXbOorMKAtQVhayhfaFCgY52Ojs4mn2kD1n9ycymoCOiluKXKHqSHQaWzQPj - CRuuw2x2jPVeOO3rDrlOW1m99lw4lWeTzI7mcf01SyFq1s+sTSG2PjHwGaB0iHN7 - ubHk/iw7fp9ZvvYpKa5IV+R3KQQdDyTBM1py1uUBNrwhmhtHMCyLs3cCAwEAAQ== - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/NOSPOONUSER-TINC b/data/tinc-key/NOSPOONUSER-TINC deleted file mode 100644 index 8f3d44c3f..000000000 --- a/data/tinc-key/NOSPOONUSER-TINC +++ /dev/null @@ -1,17 +0,0 @@ -tinc-key: NOSPOONUSER-TINC -tinc-host: nospoonuser -remarks: * This object was generated based on info from legacy -remarks: * wiki and existing host files -subnet: 172.22.255.188/32 -tinc-address: 212.168.173.241 -admin-c: NOSPOONUSER-DN42 -mnt-by: DUMMY-MNT -tinc-file: - Subnet = 172.22.255.188/32 - Address = 212.168.173.241 - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAJyuY17nR+mH+9tkNDN/bUCB16vQnzaY1A6Z+GW5yL9xSX3ubNBh654I - CkJZqSC1b1LP/f4WQELwKLuUjLNmNKZjPKQwpeUrH9bBC9swQRQBeSU5Npu35Z/C - 8REfH7FVZByZ1+2AhNRO6GrhEmP4ArAagH/y7c6yG0plPpoh43C7AgMBAAE= - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/PETRUS-TINC b/data/tinc-key/PETRUS-TINC deleted file mode 100644 index e30738936..000000000 --- a/data/tinc-key/PETRUS-TINC +++ /dev/null @@ -1,18 +0,0 @@ -tinc-key: PETRUS-TINC -tinc-host: beta -tinc-file: - Subnet = 172.22.255.162/32 - Subnet = fd04:de02:7af9::162/128 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEA3TdvMLn/LoOyOy9LJPwFVmpod3mpsQ/w2s2syhfyNBYzNIwbe0li - B/G4KMashNL34epR5DX2bh9C9GLGhbDw4xG22w2vz09ikbfy99HFZesshyRnAPko - CafZACjgzLnYj5qRneU2E/STQ1UnvE1YxxXUrciNC/GsNcmSm3nOi8mt0yv35iA7 - ywmMWNrcehazqF4xYm4ZDfg5N7dqefdfNkuDdDrzWJJlXJs7UwtIVREb5vZ4NZMa - /h4kuUsIKaUMGw6lX0S6F4PYdgwWdRVQ0uBLTItsmahQRQfUb002RcKmgP4UYlVK - r1eDcjVvUsadJYAlUDHyarks5fR4S591eQIDAQAB - -----END RSA PUBLIC KEY----- - ECDSAPublicKey = CAQ9URkmcVYW7pJ0yHIk83uv1hgH+4RPcdGvWKsIH2wTkRGgmy0mMm4i90K07g3M8pFL1MB6nEr94R8+4qyhg9VZDB - Address = poum.tk - Port = 23752 -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/RFC2460-TINC b/data/tinc-key/RFC2460-TINC deleted file mode 100644 index 7f9b430be..000000000 --- a/data/tinc-key/RFC2460-TINC +++ /dev/null @@ -1,16 +0,0 @@ -tinc-key: RFC2460-TINC -tinc-host: 2001:6f8:9f2:42::1 -mnt-by: RFC2460-MNT -admin-c: RFC2460-DN42 -subnet: 172.20.194.96/27 -tinc-file: - Subnet = 172.20.194.96/27 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAsAPZ1olsGjWtAA1fjxu+jNe43V7t15qKsgz4bIkfdpn+2CFAy4Wn - KIs5uN+BT5/i6l/Ud7ls5lv9SEX8SKo7ByK+rBLrIjeka1eDO9a3l8CtoFUEm1rZ - zUYScd5mz30YDIhffZ7B5YmaVgkOqpctp88UAVA3D4egRRDNUuuj4rU4dqOC6rE6 - Ob+9LmErEAC5nAN1ansYmsKl+CWRxo3qEU3dcpsTItfyOdusP8XEodLgVPHMNyoe - 7ZVsUcIDRr9Q3WF3yl14Rh9uAP7IaDJS6peg25/ycpLjOI5ojIyTXfOxPKyu2aVX - hWdoBUBgrSi/sBIQGW+XFlMY4r8iI6grBwIDAQAB - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/RWFCLOUD-TINC b/data/tinc-key/RWFCLOUD-TINC deleted file mode 100644 index 4cf07a43d..000000000 --- a/data/tinc-key/RWFCLOUD-TINC +++ /dev/null @@ -1,23 +0,0 @@ -tinc-key: RWFCLOUD-TINC -tinc-host: dn42 -mnt-by: RWFMON-MNT -admin-c: MON-DN42 -subnet: 172.22.132.128/26 -tinc-address: 172.22.132.129 -tinc-file: - Subnet = 172.22.132.128/26 - Address = 172.22.132.129 - -----BEGIN RSA PUBLIC KEY----- - MIICCgKCAgEA5zbN4m3WY1Jf5KxraYN0gkzhvLbBQh6YeUD1J7lt66GXTDByEZ02 - SupdgBgXSfiOMKaPcFk8DOOHN87fqsex4eGNTzyABTICgMV3yggwvhuAmzXoD/JT - aklrigpC+uCkfOpQWtpesN3EP/niGpxkybAEgMmhk3LWKFMVWX2y2TUWTSf94Yne - zMObxA6GFcxbXNgKMsn7lXNgicd9mfgTf4+Eum5BW++3ULNq+3WZ/M+/1JRaC+lI - y0E0LxMqndZYQMPA+e5PzU3RMUGMbIJiTMcXXRLdqc8EAkfXvHi5paBBoLaZGWRB - STe6B1RwAqBVNLtqb7ytp+kzE1HnoOqh5WWdF0+WdossdbMEbqNjZpH5ex4gs3/x - WS7NJ1hOic43RNgk/1bhOPQPx4cOJVsvimyQkscBn/HWgN4O+t5zew0TT8Qtd/ao - x/+Npvu1RM2Y69vu8wFhPNqvewJWraaz1Ha3cKmJGvx6zUx88bNovwXTZrr2yKJo - IA1dn1U8/7WoUfp53/Mj0N0AX46G6SfNe1LqcOWE1+oM4qSdQdjRxVMEY0yLTUV2 - 7+pDDcGsm3UNTP8rM9IiJqZrl1gaD9zeUJLkv3omYl4GY3ucgU3jfC+3FXHeKxSd - 5yxWWmUy9vSHL3WSVUqSLjUdkJdTudELmMoLRQfhoIq7vm63K/ZNzOUCAwEAAQ== - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/SCHRODINGER-TINC b/data/tinc-key/SCHRODINGER-TINC deleted file mode 100644 index 0f63c8405..000000000 --- a/data/tinc-key/SCHRODINGER-TINC +++ /dev/null @@ -1,16 +0,0 @@ -tinc-key: SCHRODINGER-TINC -tinc-host: crux -tinc-file: - Compression=9 - Subnet=172.22.255.186/32 - Address=46.105.120.196 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAsYDo0tCVp/D5e9w8tmMv99vI1qroIL0GzDAuJfAgGDZLhE2mF+Q6 - LGAe4TrRwxFVfy/c0sHH1CZ9dmg6s9ZVl9xCsa0jxD1Itvb2EpRLsUGwI6WGsO7O - tKj6MBV/n1OgE1jh4s103piI67iSlqZ4Jsy/+HZ0FhJf4T3b0WkmKBTkqNdiVl6n - z3jkhx2AJ5G5PP/lnrs/5Cz+VFICFu64dalqEqgP6Kh0eL/A0Albx8cEbTzvMwwC - DrhfXJguRMdCVWz5iQdRv++E5+Ln8oCmYUwyPeq2RruaJVUuf6COI3sUuiootXln - oQ6lXxk7Pk+4I2BUnAJTQxCHHMsYuOQeKwIDAQAB - -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/STEPHANJ-TINC b/data/tinc-key/STEPHANJ-TINC deleted file mode 100644 index 6bc554a08..000000000 --- a/data/tinc-key/STEPHANJ-TINC +++ /dev/null @@ -1,24 +0,0 @@ -tinc-key: STEPHANJ-TINC -tinc-host: stephanj -remarks: * This object was generated based on info from legacy -remarks: * wiki and existing host files -compression: 9 -subnet: 172.22.255.195/32 -subnet: fd04:de02:7af9:0:0:0:0:195/128 -tinc-address: proxyvm.stejau.de -admin-c: STEPHANJ-DN42 -mnt-by: DUMMY-MNT -tinc-file: - Subnet = 172.22.255.195/32 - Subnet = fd04:de02:7af9:0:0:0:0:195/128 - Address = proxyvm.stejau.de - Compression = 9 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEA0z8J02Icl+pSTL7pMhEC6XWzEog+MGkzqhXP+Qem2sTX6zZyW3K/ - JntMd6HYvN6By025sLCAYP+1/2FHfnUabe/6vLTRxfc/0wbhwv/41AugXyT7lz0R - UdKErdrIgSQC/tjIsWh76al5s7Hw+Xx0vVCU3z7rVrIn3J2pct/ZZUva3LzgRB++ - W5czh78pTC5YZUe//2YZ5cvyp4WLOnunnzIkCTwGju93gwS0w2c3jzTnbTyHEE6Y - tqbLvTyusYl07FDzRwG18qPaAPyAY5mglfgB2lxLlVOygF68IAIgPl9LLQ4f3TUD - pTAb+qH67VC0gjN4KbTfz3NrypMslpEtCwIDAQAB - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/UFO-TINC b/data/tinc-key/UFO-TINC deleted file mode 100644 index 49fdd183d..000000000 --- a/data/tinc-key/UFO-TINC +++ /dev/null @@ -1,16 +0,0 @@ -tinc-key: UFO-TINC -tinc-host: ufoathome -tinc-file: - Subnet = 172.22.255.183 - Address = AnoRtr.UFO-Net.nl - Port = 659 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAq2cggqGKw8nX8dg07/XejASCHZkjL81reFjRF5Y7wWDh+9T8upyX - t/+VAnylr8vvXyVSZ2J0an1nva3OWh8tzRanDGR2grrXJcrpZeVSRJhzyHqkAMJb - DBEn6xTCbRs4tS7btl+Hnra3UhhWgYyOsJaedu9AR5SBXldwzkjouAZLsy7Z1guN - nTCwAc1lNbBEModniQ/5BltSU9uVuXfao16s5qGOPlbYQIbujz+m1HSfZNFXrsHP - Cn6hGnKDWlXfm3xaOzd4Tua5xN7FZMinLPa9CgvbMOCVO89r7F0u3rePKAlFp6vQ - qJDYE3LFROC/7A+so1Aab89eH955JffPVwIDAQAB - -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/tinc-key/UVES-TINC b/data/tinc-key/UVES-TINC deleted file mode 100644 index 4378d4742..000000000 --- a/data/tinc-key/UVES-TINC +++ /dev/null @@ -1,26 +0,0 @@ -tinc-key: UVES-TINC -tinc-host: spline -remarks: * This object was generated based on info from legacy -remarks: * wiki and existing host files -compression: 9 -subnet: 172.22.255.161/32 -subnet: fd04:de02:7af9::161/128 -tinc-address: 130.133.110.158 -admin-c: UVES-DN42 -port: 28903 -mnt-by: DUMMY-MNT -tinc-file: - Subnet = 172.22.255.161/32 - Subnet = fd04:de02:7af9::161/128 - Address = 130.133.110.158 - Compression = 9 - Port = 28903 - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAzvgYeUgVeAz9OaMOSZLDctv98qSIGltAKwgTxaHt7sqouH7AUzwa - bg/0iRjK1/nGSEMbAkLaoJpo9twpVHZwleCa4Hmp/FELYo1j8TKTYClVqcYh0HLE - 3Hf5xvLBQzoTPmYjbaZgh6/MtsIZB5ETiU6yj7ygHmRjRRcIS0c6ep5vdLX5fTNJ - KV+G+fqBcDcDA9RRP4MA6WHITuy92/T+HBR7fXYFNsfm9r/LHvlF/8I0dvZQyF/R - U+S4ecok6+/bJC4C1klMtNE9nZNoLYnnqAGhIbIE+PlrRP+ZnXEgG7z9g/h8jXBn - VbwmHz08Sc9ulPtGghQAKbZQImWsGikasQIDAQAB - -----END RSA PUBLIC KEY----- -source: DN42 diff --git a/data/tinc-key/VUTRAL-TINC b/data/tinc-key/VUTRAL-TINC deleted file mode 100644 index 60a55e235..000000000 --- a/data/tinc-key/VUTRAL-TINC +++ /dev/null @@ -1,25 +0,0 @@ -tinc-key: VUTRAL-TINC -tinc-host: vger -remarks: * This object was generated based on info from legacy -remarks: * wiki and existing host files -compression: 9 -subnet: 172.22.255.180/32 -tinc-address: 85.214.19.110 -admin-c: VUTRAL-DN42 -mnt-by: DUMMY-MNT -tinc-file: - Subnet = 172.22.255.180/32 - Address = 85.214.19.110 - Compression = 9 - -----BEGIN RSA PUBLIC KEY----- - MIIBigKCAYEAxeDA19AxsR+gbOpzNr0Bv2jtW6dYLDiz8+ZW5nE/D2kqac1DvC7B - 5H4dRihVRF2LjdLHNQ9egv4Ezmky0XwBOs+UZMMeXQunJATG0Uc6HZNVap2B8imV - 77L9yp1MZtL/OsCMI/JBXRhn6+WE9yTSg9S2zllS00xoTl5muZCgu/T5pkzyPRrI - FThCu/4ePCOB7LuDiLu2TvOEaZ5P2SZJmueNvn08iBYLrFaQGJRtxl9XLh0I+9Df - COXVrOxIpWzWbOugHy/SW5QrrDwL9IvndftjisGjGXhP7UrJkp4O/1aGfNfclyJX - 6085aWA2LhDKWZA0AjgRv9b9R0e3mTRpS1qKVxEt85k86s9xf60nfZHGENbG+80+ - WlAZtX0oQXHS0jZCSg8CKXMDmAOI+WSytBxIzytsfikTKTmDcFMYu+sjlp6Ev2La - A2XKHzRB58eh+SEvU5FWl8lLPZH6bTmixZkTP9JVnXMO9cRiRX3L/tOSkHN7ypxk - EtT4MbvtFCgTAgMBAAE= - -----END RSA PUBLIC KEY----- -source: DN42