From dfcbfd02c496142f1e7a6b1b0f5941dbebb93cc3 Mon Sep 17 00:00:00 2001 From: xuu Date: Fri, 27 Oct 2017 09:59:20 -0600 Subject: [PATCH] fix various items. and make tinc files more regular. --- check-my-stuff | 2 +- data/dns/ca.dn42 | 1 - data/dns/dn42-servers.dn42 | 1 - data/dns/git.dn42 | 1 - data/dns/hackint.dn42 | 1 - data/dns/in-addr-servers.dn42 | 1 - data/dns/internal.dn42 | 1 - data/dns/irc.dn42 | 1 - data/dns/mtn.dn42 | 1 - data/dns/place.dn42 | 1 - data/dns/root-servers.dn42 | 1 - data/dns/root.dn42 | 1 - data/dns/source.dn42 | 1 - data/dns/souris.dn42 | 1 - data/dns/teams.dn42 | 1 - data/dns/whois.dn42 | 1 - data/dns/wiki.dn42 | 1 - data/dns/xuu.dn42 | 1 - data/dns/zone-servers.dn42 | 1 - data/schema/TINC-KEY-SCHEMA | 11 ++++--- data/tinc-key/2001:6f8:9f2:42::1 | 9 ------ data/tinc-key/ARIEL-TINC | 16 ++++++++++ data/tinc-key/AS4242422703 | 12 ------- data/tinc-key/AS4242422703-TINC | 13 ++++++++ data/tinc-key/AS76103IX-TINC | 18 +++++++++++ data/tinc-key/AS76103US | 17 ---------- data/tinc-key/AS76103US-TINC | 18 +++++++++++ data/tinc-key/BLAZINGUS-TINC | 17 ++++++++++ data/tinc-key/DEELKAR-TINC | 9 ++++++ data/tinc-key/DEFIANTPORT2-TINC | 18 +++++++++++ data/tinc-key/DODGER78-TINC | 16 ++++++++++ data/tinc-key/DOWNHILL-TINC | 15 +++++++++ data/tinc-key/FISHYSNAX-TINC | 19 +++++++++++ data/tinc-key/FLONET-SITE1-DN42-IP4NET | 16 ---------- data/tinc-key/FLONET-SITE1-TINC | 23 ++++++++++++++ data/tinc-key/HEX-TINC | 12 +++++++ data/tinc-key/MARTIN89-TINC | 14 ++++++++ data/tinc-key/MERLIN-TINC | 16 ++++++++++ data/tinc-key/MIAU-TINC | 12 +++++++ data/tinc-key/MNL-TINC | 14 ++++++++ data/tinc-key/MTREMER-TINC | 15 +++++++++ data/tinc-key/NOSPOONUSER-TINC | 8 +++++ data/tinc-key/NULLL-TINC | 13 ++++++++ data/tinc-key/PETRUS-TINC | 17 ++++++++++ data/tinc-key/Participants.md | 44 -------------------------- data/tinc-key/RFC2460-TINC | 10 ++++++ data/tinc-key/RWFCLOUD-TINC | 16 ++++++++++ data/tinc-key/SCHRODINGER-TINC | 15 +++++++++ data/tinc-key/STEPHANJ-TINC | 17 ++++++++-- data/tinc-key/UFO-TINC | 16 ++++++++++ data/tinc-key/UVES-TINC | 14 ++++++++ data/tinc-key/VUTRAL-TINC | 19 +++++++++-- data/tinc-key/aphrodite | 9 ------ data/tinc-key/as76103IX | 17 ---------- data/tinc-key/beta | 13 -------- data/tinc-key/crux | 11 ------- data/tinc-key/deelkar | 8 ----- data/tinc-key/defiantport2 | 14 -------- data/tinc-key/dn42 | 15 --------- data/tinc-key/dn42.maraun.de | 11 ------- data/tinc-key/dodger78 | 13 -------- data/tinc-key/geekhabitat | 11 ------- data/tinc-key/hex | 11 ------- data/tinc-key/martin89 | 13 -------- data/tinc-key/mtremer | 14 -------- data/tinc-key/noc | 12 ------- data/tinc-key/nospoonuser | 7 ---- data/tinc-key/nulll | 12 ------- data/tinc-key/shack | 12 ------- data/tinc-key/spline | 13 -------- data/tinc-key/stephanj | 12 ------- data/tinc-key/ufoathome | 12 ------- data/tinc-key/us1_blazing | 16 ---------- data/tinc-key/valeyard.fishysnax.com | 15 --------- data/tinc-key/vger | 14 -------- data/tinc-keyset/SET-1-DN42-TINC | 2 +- data/tinc-keyset/SET-3-DN42-TINC | 6 ---- 77 files changed, 414 insertions(+), 418 deletions(-) delete mode 100644 data/tinc-key/2001:6f8:9f2:42::1 create mode 100644 data/tinc-key/ARIEL-TINC delete mode 100644 data/tinc-key/AS4242422703 delete mode 100644 data/tinc-key/AS76103US create mode 100644 data/tinc-key/DEFIANTPORT2-TINC create mode 100644 data/tinc-key/DODGER78-TINC create mode 100644 data/tinc-key/DOWNHILL-TINC create mode 100644 data/tinc-key/FISHYSNAX-TINC delete mode 100644 data/tinc-key/FLONET-SITE1-DN42-IP4NET create mode 100644 data/tinc-key/FLONET-SITE1-TINC create mode 100644 data/tinc-key/MERLIN-TINC create mode 100644 data/tinc-key/MNL-TINC create mode 100644 data/tinc-key/PETRUS-TINC delete mode 100644 data/tinc-key/Participants.md create mode 100644 data/tinc-key/SCHRODINGER-TINC create mode 100644 data/tinc-key/UFO-TINC delete mode 100644 data/tinc-key/aphrodite delete mode 100644 data/tinc-key/as76103IX delete mode 100644 data/tinc-key/beta delete mode 100644 data/tinc-key/crux delete mode 100644 data/tinc-key/deelkar delete mode 100644 data/tinc-key/defiantport2 delete mode 100644 data/tinc-key/dn42 delete mode 100644 data/tinc-key/dn42.maraun.de delete mode 100644 data/tinc-key/dodger78 delete mode 100644 data/tinc-key/geekhabitat delete mode 100644 data/tinc-key/hex delete mode 100644 data/tinc-key/martin89 delete mode 100644 data/tinc-key/mtremer delete mode 100644 data/tinc-key/noc delete mode 100644 data/tinc-key/nospoonuser delete mode 100644 data/tinc-key/nulll delete mode 100644 data/tinc-key/shack delete mode 100644 data/tinc-key/spline delete mode 100644 data/tinc-key/stephanj delete mode 100644 data/tinc-key/ufoathome delete mode 100644 data/tinc-key/us1_blazing delete mode 100644 data/tinc-key/valeyard.fishysnax.com delete mode 100644 data/tinc-key/vger delete mode 100644 data/tinc-keyset/SET-3-DN42-TINC diff --git a/check-my-stuff b/check-my-stuff index d5875b708..be4993f4e 100755 --- a/check-my-stuff +++ b/check-my-stuff @@ -10,5 +10,5 @@ BASE="$(realpath "$0")" BASE="$(dirname "$BASE")" cd "$BASE" || exit 1 -utils/schema-check/dn42-schema.py scan data/ -m "$1" || ( echo "Schema validation failed, please check above!" ; exit 1 ) +utils/schema-check/dn42-schema.py -v scan data/ -m "$1" || ( echo "Schema validation failed, please check above!" ; exit 1 ) diff --git a/data/dns/ca.dn42 b/data/dns/ca.dn42 index 88bf409be..69fb43c88 100644 --- a/data/dns/ca.dn42 +++ b/data/dns/ca.dn42 @@ -1,6 +1,5 @@ domain: ca.dn42 descr: DN42 Certificate Authority -country: US admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/dns/dn42-servers.dn42 b/data/dns/dn42-servers.dn42 index 78cc7b53d..4e9b81793 100644 --- a/data/dns/dn42-servers.dn42 +++ b/data/dns/dn42-servers.dn42 @@ -1,5 +1,4 @@ domain: dn42-servers.dn42 -country: DE nserver: x.dn42-servers.dn42 172.22.141.3 nserver: x.dn42-servers.dn42 fdea:a15a:77b9:4444::3 nserver: g.dn42-servers.dn42 172.23.149.38 diff --git a/data/dns/git.dn42 b/data/dns/git.dn42 index 75133b446..29682d01c 100644 --- a/data/dns/git.dn42 +++ b/data/dns/git.dn42 @@ -1,6 +1,5 @@ domain: git.dn42 descr: GIT Web Repo -country: CA admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/dns/hackint.dn42 b/data/dns/hackint.dn42 index f5e1e05b7..7021ad08a 100644 --- a/data/dns/hackint.dn42 +++ b/data/dns/hackint.dn42 @@ -1,6 +1,5 @@ domain: hackint.dn42 nserver: souris.root.dn42 -country: DE nserver: kapha.mtr.xuu.dn42 nserver: dns1.crest.dn42 nserver: dns2.crest.dn42 diff --git a/data/dns/in-addr-servers.dn42 b/data/dns/in-addr-servers.dn42 index 9277bc1c4..7f05c27d3 100644 --- a/data/dns/in-addr-servers.dn42 +++ b/data/dns/in-addr-servers.dn42 @@ -4,7 +4,6 @@ nserver: x.in-addr-servers.dn42 172.22.141.2 nserver: x.in-addr-servers.dn42 fdea:a15a:77b9:4444::2 nserver: g.in-addr-servers.dn42 172.23.149.37 nserver: g.in-addr-servers.dn42 fd42:23:149:2::37 -country: DE admin-c: DUMMY-DN42 tech-c: NIXNODES-DN42 tech-c: SOURIS-DN42 diff --git a/data/dns/internal.dn42 b/data/dns/internal.dn42 index 104f174b7..f59c92d71 100644 --- a/data/dns/internal.dn42 +++ b/data/dns/internal.dn42 @@ -1,5 +1,4 @@ domain: internal.dn42 -country: US nserver: kapha.mtr.xuu.dn42 nserver: ns1.mhm.dn42 admin-c: SOURIS-DN42 diff --git a/data/dns/irc.dn42 b/data/dns/irc.dn42 index ec7a45661..bd159fbed 100644 --- a/data/dns/irc.dn42 +++ b/data/dns/irc.dn42 @@ -1,6 +1,5 @@ domain: irc.dn42 descr: The internal IRC network -country: DE admin-c: SOURIS-DN42 tech-c: STR-DN42 tech-c: NL-ZUID-DN42 diff --git a/data/dns/mtn.dn42 b/data/dns/mtn.dn42 index e7d33f3ac..fd4a6ccea 100644 --- a/data/dns/mtn.dn42 +++ b/data/dns/mtn.dn42 @@ -1,6 +1,5 @@ domain: mtn.dn42 descr: Monotone Repo -country: CA admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/dns/place.dn42 b/data/dns/place.dn42 index 9350991c7..9dc7663e2 100644 --- a/data/dns/place.dn42 +++ b/data/dns/place.dn42 @@ -1,6 +1,5 @@ domain: place.dn42 descr: A place to idle away the time -country: CA admin-c: XUU-DN42 tech-c: XUU-DN42 mnt-by: XUU-MNT diff --git a/data/dns/root-servers.dn42 b/data/dns/root-servers.dn42 index 532798c70..8e990bc59 100644 --- a/data/dns/root-servers.dn42 +++ b/data/dns/root-servers.dn42 @@ -9,7 +9,6 @@ nserver: k.root-servers.dn42 fd42:20:50::3 remarks: !! DISABLED !! nserver: a.root-servers.dn42 172.22.177.6 remarks: !! DISABLED !! nserver: a.root-servers.dn42 fd42:1107:1:ec::cc remarks: !! DISABLED !! nserver: t.root-servers.dn42 172.22.102.141 -country: XD admin-c: DUMMY-DN42 tech-c: NIXNODES-DN42 tech-c: SOURIS-DN42 diff --git a/data/dns/root.dn42 b/data/dns/root.dn42 index 3fc7c2e6b..a6814c2e0 100644 --- a/data/dns/root.dn42 +++ b/data/dns/root.dn42 @@ -2,7 +2,6 @@ domain: root.dn42 nserver: lavana.sjc.xuu.dn42 nserver: kapha.mtr.xuu.dn42 nserver: rishi.bre.xuu.dn42 -country: DE admin-c: DUMMY-DN42 tech-c: WELTERDE-DN42 tech-c: SISKA-DN42 diff --git a/data/dns/source.dn42 b/data/dns/source.dn42 index 3d5247673..5b83a8e04 100644 --- a/data/dns/source.dn42 +++ b/data/dns/source.dn42 @@ -1,6 +1,5 @@ domain: source.dn42 descr: Source code repos -country: CA admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/dns/souris.dn42 b/data/dns/souris.dn42 index 33c7c036a..189f60698 100644 --- a/data/dns/souris.dn42 +++ b/data/dns/souris.dn42 @@ -1,6 +1,5 @@ domain: souris.dn42 descr: Souris Darknet Services -country: CA admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/dns/teams.dn42 b/data/dns/teams.dn42 index ee35199f8..6798981b1 100644 --- a/data/dns/teams.dn42 +++ b/data/dns/teams.dn42 @@ -1,6 +1,5 @@ domain: teams.dn42 descr: Team Collaboration Portal (MatterMost) -country: DE admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/dns/whois.dn42 b/data/dns/whois.dn42 index 9a8ad3486..a2a95b141 100644 --- a/data/dns/whois.dn42 +++ b/data/dns/whois.dn42 @@ -6,4 +6,3 @@ status: EVALPEND 1503919245 mnt-by: XUU-MNT admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 -country: US diff --git a/data/dns/wiki.dn42 b/data/dns/wiki.dn42 index 1a621d3c4..1f7643d7a 100644 --- a/data/dns/wiki.dn42 +++ b/data/dns/wiki.dn42 @@ -1,5 +1,4 @@ domain: wiki.dn42 -country: US nserver: kapha.mtr.xuu.dn42 nserver: ns1.mhm.dn42 admin-c: SOURIS-DN42 diff --git a/data/dns/xuu.dn42 b/data/dns/xuu.dn42 index a34d13466..425341eb7 100644 --- a/data/dns/xuu.dn42 +++ b/data/dns/xuu.dn42 @@ -1,5 +1,4 @@ domain: xuu.dn42 -country: US nserver: lavana.sjc.xuu.dn42 172.22.141.181 nserver: lavana.sjc.xuu.dn42 fdea:a15a:77b9:4444::181 nserver: kapha.mtr.xuu.dn42 172.22.141.171 diff --git a/data/dns/zone-servers.dn42 b/data/dns/zone-servers.dn42 index 6a30313bf..7b60fe710 100644 --- a/data/dns/zone-servers.dn42 +++ b/data/dns/zone-servers.dn42 @@ -4,7 +4,6 @@ nserver: x.zone-servers.dn42 172.22.141.2 nserver: x.zone-servers.dn42 fdea:a15a:77b9:4444::2 nserver: g.zone-servers.dn42 172.23.149.36 nserver: g.zone-servers.dn42 fd42:23:149:2::36 -country: DE admin-c: DUMMY-DN42 tech-c: NIXNODES-DN42 tech-c: SOURIS-DN42 diff --git a/data/schema/TINC-KEY-SCHEMA b/data/schema/TINC-KEY-SCHEMA index a2e17ef2d..66a1472e8 100644 --- a/data/schema/TINC-KEY-SCHEMA +++ b/data/schema/TINC-KEY-SCHEMA @@ -2,11 +2,12 @@ schema: TINC-KEY-SCHEMA ref: dn42.tinc-key key: tinc-key required single primary schema key: tinc-host required single -key: descr required single -key: compression required single -key: subnet required multiple -key: tinc-address required single -key: port required single +key: tinc-file required single +key: descr optional single +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 diff --git a/data/tinc-key/2001:6f8:9f2:42::1 b/data/tinc-key/2001:6f8:9f2:42::1 deleted file mode 100644 index 2bf8a3471..000000000 --- a/data/tinc-key/2001:6f8:9f2:42::1 +++ /dev/null @@ -1,9 +0,0 @@ -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----- diff --git a/data/tinc-key/ARIEL-TINC b/data/tinc-key/ARIEL-TINC new file mode 100644 index 000000000..6519c5337 --- /dev/null +++ b/data/tinc-key/ARIEL-TINC @@ -0,0 +1,16 @@ +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 diff --git a/data/tinc-key/AS4242422703 b/data/tinc-key/AS4242422703 deleted file mode 100644 index 40bead7f6..000000000 --- a/data/tinc-key/AS4242422703 +++ /dev/null @@ -1,12 +0,0 @@ -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----- diff --git a/data/tinc-key/AS4242422703-TINC b/data/tinc-key/AS4242422703-TINC index e0e5b729b..7bedc7d91 100644 --- a/data/tinc-key/AS4242422703-TINC +++ b/data/tinc-key/AS4242422703-TINC @@ -6,3 +6,16 @@ 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----- diff --git a/data/tinc-key/AS76103IX-TINC b/data/tinc-key/AS76103IX-TINC index 6326014d8..a27d7b6b6 100644 --- a/data/tinc-key/AS76103IX-TINC +++ b/data/tinc-key/AS76103IX-TINC @@ -7,3 +7,21 @@ tinc-address: 89.212.170.109 port: 10409 admin-c: ORG-NIXNODES mnt-by: NIXNODES-MNT +tinc-file: + Subnet = 172.23.3.1/32 + Address = 89.212.170.109 + Compression = 9 + Port = 10409 + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAvGjqLo42DcMnSj7SyNBok3eh/F/evdEJTuiGelwlZXrwsVzIQL/A + stHoQZch7+sEFg6QB6KxCn7Uttzc6K+cHyXzewHC9ZyJ+5SHIDBu+TemKwwmyIoS + DNzikp2TEdqk5MtoFvhiT9HbFQUEBnaubUs4eECBE0DiN3avTb7F6rGxTQI8ev2h + cVrre/BPiPrXPkEsHH35jueoLiHmPjcuZn23xl96EJEZ++x/gNSLexnBXTTVT3D7 + UYw3etIkTT4k1OhoA6fxIFPeVZaCcA4FSweh+QW70RvQRhjfDvRKvB/MFwyVpnAF + QzgBu4e9aJ8CRIqIHly71O/UiZknPlDe6wLjLMN5hVxyH8rKio9Po69BihHW7Voc + u/5gvHu1DC8/0SdkDlSIvkhrqB0MTe0ISxfwBhwSN9VOnZmt8QKHLIB+bvuLJy2+ + gZeY6fk3jVBWXiBfztp6ujjCCgtSG4jHX4yeDE5M+mwb6xbJ6K4Ynm1RqKNCrLBc + GKSjtdPhxDBlqaCY3IPCb9NwSNrAeZr4+f/tmAXj34QAcPxHaCyvZ4jacVTiVbp/ + Wb2OuAw151JeGd9bQIACKtgg4KgBScOGfKKlTWoZbEnnX9oMrioTn3upKnp+kEru + WFk8+M/hScWXq+WDLmufD60xHzN8Kuz8BwP+hxtPUzH1AV8EoYFWVM0CAwEAAQ== + -----END RSA PUBLIC KEY----- diff --git a/data/tinc-key/AS76103US b/data/tinc-key/AS76103US deleted file mode 100644 index 265ab168c..000000000 --- a/data/tinc-key/AS76103US +++ /dev/null @@ -1,17 +0,0 @@ -Subnet = 172.23.3.3/32 -Address = 71.19.233.189 -Compression = 9 -Port = 10409 ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAvIZc+kQo7oi7Q71rNWK6GKc4+pZ+jOGdRNFzlMedblbDTjXVuh2V -D6F4FT0EitNLPNc69k8/j7kx8ElbJDTaiC4mplixGAA5ZH4V6rtwlae9Fcc8SK+R -TjZHALL2sB+UBNfQAHSUyNpdFhLL7cbc2IJDFvzRVwGm4E92dr1dug+dki5LxKTD -rHJvwPW4KC1doXj0C8zH0vmekWTEh2SKYQcEOaGO0We4qr3+J/C3EAxEOqTk0m9g -SqljmnMXLFc5wwkdWJsu45VHD41U89nJJY+Gkz95Lyzpbb9jmxb+VBv1LLoWT1Mq -BjcY9KYIzqb5V2CS1foAFtL2t8SD4UW02LplrH5KplmrKlYzx2CHD4DXc2dzApzM -HWMWCKEJdUgeGBY/R+vkn4BHQaMyOPxJ18+iiC7FDywznvFMADOFX6g5ZnGdoZPD -c7fpVflOec1+0BoZdrOpsmIqcjcqPkn61f6M2+ZCS4Xy6JcKSOl/4wcp7YA/GE3K -QaTRSRQbvR0qTqTq0QqEULu8R8Z3Yii/XUQZ3a+AV/r3p/bc+e/jgyag/kdPGTLT -/LloKWc2g1e/t/z2saHlsabxhfRUGwwOJ6+XFrMVtxzUl1cyujIqFqOUyRgDkdJA -RpUnDV5CttQKLf03ZkZyoHnxTlE8a6jWmc0jF2ADQS9M+avS9CFzQgsCAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/data/tinc-key/AS76103US-TINC b/data/tinc-key/AS76103US-TINC index 15dee0303..f4eae9de3 100644 --- a/data/tinc-key/AS76103US-TINC +++ b/data/tinc-key/AS76103US-TINC @@ -7,3 +7,21 @@ tinc-address: 71.19.233.189 port: 10409 admin-c: ORG-NIXNODES mnt-by: NIXNODES-MNT +tinc-file: + Subnet = 172.23.3.3/32 + Address = 71.19.233.189 + Compression = 9 + Port = 10409 + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAvIZc+kQo7oi7Q71rNWK6GKc4+pZ+jOGdRNFzlMedblbDTjXVuh2V + D6F4FT0EitNLPNc69k8/j7kx8ElbJDTaiC4mplixGAA5ZH4V6rtwlae9Fcc8SK+R + TjZHALL2sB+UBNfQAHSUyNpdFhLL7cbc2IJDFvzRVwGm4E92dr1dug+dki5LxKTD + rHJvwPW4KC1doXj0C8zH0vmekWTEh2SKYQcEOaGO0We4qr3+J/C3EAxEOqTk0m9g + SqljmnMXLFc5wwkdWJsu45VHD41U89nJJY+Gkz95Lyzpbb9jmxb+VBv1LLoWT1Mq + BjcY9KYIzqb5V2CS1foAFtL2t8SD4UW02LplrH5KplmrKlYzx2CHD4DXc2dzApzM + HWMWCKEJdUgeGBY/R+vkn4BHQaMyOPxJ18+iiC7FDywznvFMADOFX6g5ZnGdoZPD + c7fpVflOec1+0BoZdrOpsmIqcjcqPkn61f6M2+ZCS4Xy6JcKSOl/4wcp7YA/GE3K + QaTRSRQbvR0qTqTq0QqEULu8R8Z3Yii/XUQZ3a+AV/r3p/bc+e/jgyag/kdPGTLT + /LloKWc2g1e/t/z2saHlsabxhfRUGwwOJ6+XFrMVtxzUl1cyujIqFqOUyRgDkdJA + RpUnDV5CttQKLf03ZkZyoHnxTlE8a6jWmc0jF2ADQS9M+avS9CFzQgsCAwEAAQ== + -----END RSA PUBLIC KEY----- diff --git a/data/tinc-key/BLAZINGUS-TINC b/data/tinc-key/BLAZINGUS-TINC index 703b9c5c2..56ad175a9 100644 --- a/data/tinc-key/BLAZINGUS-TINC +++ b/data/tinc-key/BLAZINGUS-TINC @@ -6,3 +6,20 @@ 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----- diff --git a/data/tinc-key/DEELKAR-TINC b/data/tinc-key/DEELKAR-TINC index e404d3daf..588aa0e74 100644 --- a/data/tinc-key/DEELKAR-TINC +++ b/data/tinc-key/DEELKAR-TINC @@ -7,3 +7,12 @@ 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----- diff --git a/data/tinc-key/DEFIANTPORT2-TINC b/data/tinc-key/DEFIANTPORT2-TINC new file mode 100644 index 000000000..b47d5ca37 --- /dev/null +++ b/data/tinc-key/DEFIANTPORT2-TINC @@ -0,0 +1,18 @@ +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 \ No newline at end of file diff --git a/data/tinc-key/DODGER78-TINC b/data/tinc-key/DODGER78-TINC new file mode 100644 index 000000000..fcd8a49e9 --- /dev/null +++ b/data/tinc-key/DODGER78-TINC @@ -0,0 +1,16 @@ +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 \ No newline at end of file diff --git a/data/tinc-key/DOWNHILL-TINC b/data/tinc-key/DOWNHILL-TINC new file mode 100644 index 000000000..c682d06d0 --- /dev/null +++ b/data/tinc-key/DOWNHILL-TINC @@ -0,0 +1,15 @@ +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 \ No newline at end of file diff --git a/data/tinc-key/FISHYSNAX-TINC b/data/tinc-key/FISHYSNAX-TINC new file mode 100644 index 000000000..f41c92a99 --- /dev/null +++ b/data/tinc-key/FISHYSNAX-TINC @@ -0,0 +1,19 @@ +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 \ No newline at end of file diff --git a/data/tinc-key/FLONET-SITE1-DN42-IP4NET b/data/tinc-key/FLONET-SITE1-DN42-IP4NET deleted file mode 100644 index 79ee28e80..000000000 --- a/data/tinc-key/FLONET-SITE1-DN42-IP4NET +++ /dev/null @@ -1,16 +0,0 @@ -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----- diff --git a/data/tinc-key/FLONET-SITE1-TINC b/data/tinc-key/FLONET-SITE1-TINC new file mode 100644 index 000000000..ec8444598 --- /dev/null +++ b/data/tinc-key/FLONET-SITE1-TINC @@ -0,0 +1,23 @@ +tinc-key: FLONET-SITE1-TINC +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----- diff --git a/data/tinc-key/HEX-TINC b/data/tinc-key/HEX-TINC index 047b78308..95a527e7a 100644 --- a/data/tinc-key/HEX-TINC +++ b/data/tinc-key/HEX-TINC @@ -6,3 +6,15 @@ 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----- diff --git a/data/tinc-key/MARTIN89-TINC b/data/tinc-key/MARTIN89-TINC index b1b0db4c3..1f2ff8b21 100644 --- a/data/tinc-key/MARTIN89-TINC +++ b/data/tinc-key/MARTIN89-TINC @@ -7,3 +7,17 @@ tinc-address: 37.187.4.8 port: 655 admin-c: MARTIN89-DN42 mnt-by: DUMMY-MNT +tinc-file: + Subnet = 172.22.255.178/32 + Subnet = fd04:de02:7af9:0:0:0:0:178/128 + Address = 37.187.4.8 + Port = 655 + Compression = 10 + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAycIoGLOmpBTsHWsM7LHkM0pHRccHikVaEWrAMtPfFKuhzcUv2cWp + PC+r+EpqlFqCaTdVpm3ALMtZ32N0AcHo6tDqS5jfaBJe8j2IMmaISWzHjdHvLur1 + /Q4xEQdjdYihKLIETv3DbSbZjWSx/oIptVuoJS0dOjeIS07qYp1L5uvMARrC0qSj + KP0UQNbUyuaTIINaAApP+j7eJzU7JOAFblzBl3caY9QY1lRWxuawERYo6QTr5wmC + c3BFtWXWqez6JGmWrJhJJ5PbOMTW8WLDhqjiDJXlOjKW42Tp2yy3yILi5rEfu4+p + tXEsR+KIc1U0ecPH7JWUge9ts/vWQ7jYmQIDAQAB + -----END RSA PUBLIC KEY----- diff --git a/data/tinc-key/MERLIN-TINC b/data/tinc-key/MERLIN-TINC new file mode 100644 index 000000000..64179bed9 --- /dev/null +++ b/data/tinc-key/MERLIN-TINC @@ -0,0 +1,16 @@ +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 \ No newline at end of file diff --git a/data/tinc-key/MIAU-TINC b/data/tinc-key/MIAU-TINC index 8f1e298c1..b19d28cc4 100644 --- a/data/tinc-key/MIAU-TINC +++ b/data/tinc-key/MIAU-TINC @@ -6,3 +6,15 @@ mnt-by: MIAU-MNT admin-c: MIAU-DN42 subnet: 172.20.148.1/32 tinc-address: dn42.maraun.de +tinc-file: + Subnet = 172.20.148.1/32 + Address = dn42.maraun.de + Compression = 5 + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAyAON/9HE4kNIQ4BmrxhN16Nwaz9Zm3n3RrC3vVI5VT8rit/KcvfA + dcfCxQXk8X2xdVOg02Wd7mJWlRdB6f40WEzlwskRu3eua+RrCf7rpaYmotA0ycnL + T3LC45ClYxhMwOz9lRH+8KEXkESLmcJJAe6w13heRwdFiVHA6qmOZanEte5PD+jp + hprnotJZ8oQeVyURtK5LBtMI8CRBK+rW29Wou8hR9ZDPzMDzkjID4Ha+Ov4MfCgW + li1yvpYLYqmIw+27iAPb9XUBl0oErzAPYEZ4OlQvFlMh+Ppp54yzbquh+o80WPFt + 0Rx8d+3YDZsylDNR5fj74UmIdm4m0m5hswIDAQAB + -----END RSA PUBLIC KEY----- diff --git a/data/tinc-key/MNL-TINC b/data/tinc-key/MNL-TINC new file mode 100644 index 000000000..51bf9457b --- /dev/null +++ b/data/tinc-key/MNL-TINC @@ -0,0 +1,14 @@ +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 \ No newline at end of file diff --git a/data/tinc-key/MTREMER-TINC b/data/tinc-key/MTREMER-TINC index 51b4d7b79..1605d81d7 100644 --- a/data/tinc-key/MTREMER-TINC +++ b/data/tinc-key/MTREMER-TINC @@ -5,3 +5,18 @@ 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----- diff --git a/data/tinc-key/NOSPOONUSER-TINC b/data/tinc-key/NOSPOONUSER-TINC index 631250484..2fc55b110 100644 --- a/data/tinc-key/NOSPOONUSER-TINC +++ b/data/tinc-key/NOSPOONUSER-TINC @@ -6,3 +6,11 @@ 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----- diff --git a/data/tinc-key/NULLL-TINC b/data/tinc-key/NULLL-TINC index 2c3e09dc5..4d3cd9fd5 100644 --- a/data/tinc-key/NULLL-TINC +++ b/data/tinc-key/NULLL-TINC @@ -7,3 +7,16 @@ admin-c: STV0G-DN42 subnet: 172.23.3.5/32 tinc-address: tux.0l.de port: 657 +tinc-file: + Subnet = 172.23.3.5/32 + Address = tux.0l.de + Compression = 9 + Port = 657 + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAvTon5K5GcXd8k3Z+yIOLkwNLByUo4aHp6P4X35TK5GgCIZY7Mi7x + K6V9YmRWEcPylHQQTJcvjRATFc2jBcjn6rfdWK+hYDF68GXEt6jjAIVmADF/fwTy + 3f/F19uFxfgqCOqJIs9GZF2QePYRRoC+rBRpArD7CyJi0ZaxuH8d9oFc4lxvrL8X + zjLbQ09udelC87eEvBL6kLb1420blMLz7M92Si/ErEr8GbSGqo34GUx4n14fv8bQ + XEIftMFZXQzZaAyBYYlXFX5OIDsJKA0pGedJFn1pnc5nuyj6fXCHxAjBFqC6/Odb + dAuG0GNchC0Y3JHQf0ktoDfWPUGqSR+EPQIDAQAB + -----END RSA PUBLIC KEY----- \ No newline at end of file diff --git a/data/tinc-key/PETRUS-TINC b/data/tinc-key/PETRUS-TINC new file mode 100644 index 000000000..f59c5aa90 --- /dev/null +++ b/data/tinc-key/PETRUS-TINC @@ -0,0 +1,17 @@ +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 \ No newline at end of file diff --git a/data/tinc-key/Participants.md b/data/tinc-key/Participants.md deleted file mode 100644 index 6419d29ca..000000000 --- a/data/tinc-key/Participants.md +++ /dev/null @@ -1,44 +0,0 @@ -first tinc cloud -================ - -ipv4: 172.22.255.176/28 -ipv6: fd04:de02:7af9::/64 - -IP IPv6 User Host ASN --------------- ---------------------- --------- ----------- ----- -172.22.255.177 downhill geekhabitat 64655 -172.22.255.178 fd04:de02:7af9::178/64 Martin89 martin89 64713 -172.22.255.179 fd04:de02:7af9::179/64 welterde hex 64738 -172.22.255.180 fd04:de02:7af9::180/64 Vutral vger 64787 -172.22.255.181 fd04:de02:7af9::181/64 --- free --- -172.22.255.182 fd04:de02:7af9::182/64 mnl aphrodite 64758 -172.22.255.183 UFO ufoathome 64766 -172.22.255.184 fd04:de02:7af9::184/64 ariel shack 64714 -172.22.255.185 lowkey cerberus? 65023 -172.22.255.186 fd04:de02:7af9::186/64 schrodinger crux 64664 -172.22.255.187 fd04:de02:7af9::187/64 deelkar deelkar 64827 -172.22.255.188 nospoonuser nospoonuser 64756 -172.22.255.189 fd04:de02:7af9::189/64 --- free --- -172.22.255.190 fd04:de02:7af9::190/64 liameph meph? 64790 -172.22.255.194 fd04:de02:7af9::194/64 merlin noc 64831 -172.22.255.195 fd04:de02:7af9::195/64 stephanj stephanj 64674 --------------- ---------------------- --------- ----------- ----- - -IPv6 User Host ASN ---------------------------------------- -------- -------- ----- -fd04:de02:7af9:0000:dead:0000:fca0:1/64 dodger78 dodger78 64672 ---------------------------------------- -------- -------- ----- - -second tinc cloud -================= -(opened because the ipv4 range above is full) - -ipv4: 172.22.255.160/28 -ipv6: fd04:de02:7af9::/64 - -IP IPv6 User Host ASN --------------- ------------------- --------- ----------- ----- -172.22.255.161 fd04:de02:7af9::161 uves spline 64733 -172.22.255.162 fd04:de02:7af9::162 petrus beta 64751 --------------- ------------------- --------- ----------- ----- - diff --git a/data/tinc-key/RFC2460-TINC b/data/tinc-key/RFC2460-TINC index 5cc230861..782932087 100644 --- a/data/tinc-key/RFC2460-TINC +++ b/data/tinc-key/RFC2460-TINC @@ -3,3 +3,13 @@ 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----- diff --git a/data/tinc-key/RWFCLOUD-TINC b/data/tinc-key/RWFCLOUD-TINC index 81a199a65..65c4df25d 100644 --- a/data/tinc-key/RWFCLOUD-TINC +++ b/data/tinc-key/RWFCLOUD-TINC @@ -4,3 +4,19 @@ 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----- diff --git a/data/tinc-key/SCHRODINGER-TINC b/data/tinc-key/SCHRODINGER-TINC new file mode 100644 index 000000000..a63129802 --- /dev/null +++ b/data/tinc-key/SCHRODINGER-TINC @@ -0,0 +1,15 @@ +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 \ No newline at end of file diff --git a/data/tinc-key/STEPHANJ-TINC b/data/tinc-key/STEPHANJ-TINC index f36b955fe..74b004c78 100644 --- a/data/tinc-key/STEPHANJ-TINC +++ b/data/tinc-key/STEPHANJ-TINC @@ -1,10 +1,23 @@ tinc-key: STEPHANJ-TINC tinc-host: stephanj -descr: * This object was generated based on info from legacy -descr: * wiki and existing host files +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----- diff --git a/data/tinc-key/UFO-TINC b/data/tinc-key/UFO-TINC new file mode 100644 index 000000000..686c3bd40 --- /dev/null +++ b/data/tinc-key/UFO-TINC @@ -0,0 +1,16 @@ +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 \ No newline at end of file diff --git a/data/tinc-key/UVES-TINC b/data/tinc-key/UVES-TINC index 02e56a418..73866e7a2 100644 --- a/data/tinc-key/UVES-TINC +++ b/data/tinc-key/UVES-TINC @@ -9,3 +9,17 @@ 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----- diff --git a/data/tinc-key/VUTRAL-TINC b/data/tinc-key/VUTRAL-TINC index 25a021d6d..30ef629dd 100644 --- a/data/tinc-key/VUTRAL-TINC +++ b/data/tinc-key/VUTRAL-TINC @@ -1,9 +1,24 @@ tinc-key: VUTRAL-TINC tinc-host: vger -descr: * This object was generated based on info from legacy -descr: * wiki and existing host files +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----- diff --git a/data/tinc-key/aphrodite b/data/tinc-key/aphrodite deleted file mode 100644 index 99864a070..000000000 --- a/data/tinc-key/aphrodite +++ /dev/null @@ -1,9 +0,0 @@ -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----- diff --git a/data/tinc-key/as76103IX b/data/tinc-key/as76103IX deleted file mode 100644 index 3188ac4ba..000000000 --- a/data/tinc-key/as76103IX +++ /dev/null @@ -1,17 +0,0 @@ -Subnet = 172.23.3.1/32 -Address = 89.212.170.109 -Compression = 9 -Port = 10409 ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAvGjqLo42DcMnSj7SyNBok3eh/F/evdEJTuiGelwlZXrwsVzIQL/A -stHoQZch7+sEFg6QB6KxCn7Uttzc6K+cHyXzewHC9ZyJ+5SHIDBu+TemKwwmyIoS -DNzikp2TEdqk5MtoFvhiT9HbFQUEBnaubUs4eECBE0DiN3avTb7F6rGxTQI8ev2h -cVrre/BPiPrXPkEsHH35jueoLiHmPjcuZn23xl96EJEZ++x/gNSLexnBXTTVT3D7 -UYw3etIkTT4k1OhoA6fxIFPeVZaCcA4FSweh+QW70RvQRhjfDvRKvB/MFwyVpnAF -QzgBu4e9aJ8CRIqIHly71O/UiZknPlDe6wLjLMN5hVxyH8rKio9Po69BihHW7Voc -u/5gvHu1DC8/0SdkDlSIvkhrqB0MTe0ISxfwBhwSN9VOnZmt8QKHLIB+bvuLJy2+ -gZeY6fk3jVBWXiBfztp6ujjCCgtSG4jHX4yeDE5M+mwb6xbJ6K4Ynm1RqKNCrLBc -GKSjtdPhxDBlqaCY3IPCb9NwSNrAeZr4+f/tmAXj34QAcPxHaCyvZ4jacVTiVbp/ -Wb2OuAw151JeGd9bQIACKtgg4KgBScOGfKKlTWoZbEnnX9oMrioTn3upKnp+kEru -WFk8+M/hScWXq+WDLmufD60xHzN8Kuz8BwP+hxtPUzH1AV8EoYFWVM0CAwEAAQ== ------END RSA PUBLIC KEY----- diff --git a/data/tinc-key/beta b/data/tinc-key/beta deleted file mode 100644 index 2eed001c8..000000000 --- a/data/tinc-key/beta +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/data/tinc-key/crux b/data/tinc-key/crux deleted file mode 100644 index f38dcb578..000000000 --- a/data/tinc-key/crux +++ /dev/null @@ -1,11 +0,0 @@ -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----- diff --git a/data/tinc-key/deelkar b/data/tinc-key/deelkar deleted file mode 100644 index fd4488424..000000000 --- a/data/tinc-key/deelkar +++ /dev/null @@ -1,8 +0,0 @@ -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----- diff --git a/data/tinc-key/defiantport2 b/data/tinc-key/defiantport2 deleted file mode 100644 index 7d678e1dc..000000000 --- a/data/tinc-key/defiantport2 +++ /dev/null @@ -1,14 +0,0 @@ -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----- diff --git a/data/tinc-key/dn42 b/data/tinc-key/dn42 deleted file mode 100644 index 6b0ab38a9..000000000 --- a/data/tinc-key/dn42 +++ /dev/null @@ -1,15 +0,0 @@ -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----- diff --git a/data/tinc-key/dn42.maraun.de b/data/tinc-key/dn42.maraun.de deleted file mode 100644 index cf682d675..000000000 --- a/data/tinc-key/dn42.maraun.de +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 172.20.148.1/32 -Address = dn42.maraun.de -Compression = 5 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAyAON/9HE4kNIQ4BmrxhN16Nwaz9Zm3n3RrC3vVI5VT8rit/KcvfA -dcfCxQXk8X2xdVOg02Wd7mJWlRdB6f40WEzlwskRu3eua+RrCf7rpaYmotA0ycnL -T3LC45ClYxhMwOz9lRH+8KEXkESLmcJJAe6w13heRwdFiVHA6qmOZanEte5PD+jp -hprnotJZ8oQeVyURtK5LBtMI8CRBK+rW29Wou8hR9ZDPzMDzkjID4Ha+Ov4MfCgW -li1yvpYLYqmIw+27iAPb9XUBl0oErzAPYEZ4OlQvFlMh+Ppp54yzbquh+o80WPFt -0Rx8d+3YDZsylDNR5fj74UmIdm4m0m5hswIDAQAB ------END RSA PUBLIC KEY----- diff --git a/data/tinc-key/dodger78 b/data/tinc-key/dodger78 deleted file mode 100644 index 21ae5753a..000000000 --- a/data/tinc-key/dodger78 +++ /dev/null @@ -1,13 +0,0 @@ -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----- - diff --git a/data/tinc-key/geekhabitat b/data/tinc-key/geekhabitat deleted file mode 100644 index 861f5cde0..000000000 --- a/data/tinc-key/geekhabitat +++ /dev/null @@ -1,11 +0,0 @@ -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----- diff --git a/data/tinc-key/hex b/data/tinc-key/hex deleted file mode 100644 index 95aebeea1..000000000 --- a/data/tinc-key/hex +++ /dev/null @@ -1,11 +0,0 @@ -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----- diff --git a/data/tinc-key/martin89 b/data/tinc-key/martin89 deleted file mode 100644 index 8c59cb339..000000000 --- a/data/tinc-key/martin89 +++ /dev/null @@ -1,13 +0,0 @@ -Subnet = 172.22.255.178/32 -Subnet = fd04:de02:7af9:0:0:0:0:178/128 -Address = 37.187.4.8 -Port = 655 -Compression = 10 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAycIoGLOmpBTsHWsM7LHkM0pHRccHikVaEWrAMtPfFKuhzcUv2cWp -PC+r+EpqlFqCaTdVpm3ALMtZ32N0AcHo6tDqS5jfaBJe8j2IMmaISWzHjdHvLur1 -/Q4xEQdjdYihKLIETv3DbSbZjWSx/oIptVuoJS0dOjeIS07qYp1L5uvMARrC0qSj -KP0UQNbUyuaTIINaAApP+j7eJzU7JOAFblzBl3caY9QY1lRWxuawERYo6QTr5wmC -c3BFtWXWqez6JGmWrJhJJ5PbOMTW8WLDhqjiDJXlOjKW42Tp2yy3yILi5rEfu4+p -tXEsR+KIc1U0ecPH7JWUge9ts/vWQ7jYmQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/data/tinc-key/mtremer b/data/tinc-key/mtremer deleted file mode 100644 index 1e59dbef9..000000000 --- a/data/tinc-key/mtremer +++ /dev/null @@ -1,14 +0,0 @@ -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----- diff --git a/data/tinc-key/noc b/data/tinc-key/noc deleted file mode 100644 index 76a67e12e..000000000 --- a/data/tinc-key/noc +++ /dev/null @@ -1,12 +0,0 @@ -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----- diff --git a/data/tinc-key/nospoonuser b/data/tinc-key/nospoonuser deleted file mode 100644 index 6d319c169..000000000 --- a/data/tinc-key/nospoonuser +++ /dev/null @@ -1,7 +0,0 @@ -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----- diff --git a/data/tinc-key/nulll b/data/tinc-key/nulll deleted file mode 100644 index 44d48a47f..000000000 --- a/data/tinc-key/nulll +++ /dev/null @@ -1,12 +0,0 @@ -Subnet = 172.23.3.5/32 -Address = tux.0l.de -Compression = 9 -Port = 657 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAvTon5K5GcXd8k3Z+yIOLkwNLByUo4aHp6P4X35TK5GgCIZY7Mi7x -K6V9YmRWEcPylHQQTJcvjRATFc2jBcjn6rfdWK+hYDF68GXEt6jjAIVmADF/fwTy -3f/F19uFxfgqCOqJIs9GZF2QePYRRoC+rBRpArD7CyJi0ZaxuH8d9oFc4lxvrL8X -zjLbQ09udelC87eEvBL6kLb1420blMLz7M92Si/ErEr8GbSGqo34GUx4n14fv8bQ -XEIftMFZXQzZaAyBYYlXFX5OIDsJKA0pGedJFn1pnc5nuyj6fXCHxAjBFqC6/Odb -dAuG0GNchC0Y3JHQf0ktoDfWPUGqSR+EPQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/data/tinc-key/shack b/data/tinc-key/shack deleted file mode 100644 index 130d16692..000000000 --- a/data/tinc-key/shack +++ /dev/null @@ -1,12 +0,0 @@ -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----- diff --git a/data/tinc-key/spline b/data/tinc-key/spline deleted file mode 100644 index b453776be..000000000 --- a/data/tinc-key/spline +++ /dev/null @@ -1,13 +0,0 @@ -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----- diff --git a/data/tinc-key/stephanj b/data/tinc-key/stephanj deleted file mode 100644 index e6dced16d..000000000 --- a/data/tinc-key/stephanj +++ /dev/null @@ -1,12 +0,0 @@ -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----- diff --git a/data/tinc-key/ufoathome b/data/tinc-key/ufoathome deleted file mode 100644 index f17cfe107..000000000 --- a/data/tinc-key/ufoathome +++ /dev/null @@ -1,12 +0,0 @@ -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----- diff --git a/data/tinc-key/us1_blazing b/data/tinc-key/us1_blazing deleted file mode 100644 index 465b0d189..000000000 --- a/data/tinc-key/us1_blazing +++ /dev/null @@ -1,16 +0,0 @@ -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----- diff --git a/data/tinc-key/valeyard.fishysnax.com b/data/tinc-key/valeyard.fishysnax.com deleted file mode 100644 index c6befa335..000000000 --- a/data/tinc-key/valeyard.fishysnax.com +++ /dev/null @@ -1,15 +0,0 @@ -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----- \ No newline at end of file diff --git a/data/tinc-key/vger b/data/tinc-key/vger deleted file mode 100644 index 5271c3d88..000000000 --- a/data/tinc-key/vger +++ /dev/null @@ -1,14 +0,0 @@ -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----- diff --git a/data/tinc-keyset/SET-1-DN42-TINC b/data/tinc-keyset/SET-1-DN42-TINC index fe23366da..da047e11e 100644 --- a/data/tinc-keyset/SET-1-DN42-TINC +++ b/data/tinc-keyset/SET-1-DN42-TINC @@ -2,5 +2,5 @@ tinc-keyset: SET-1-DN42-TINC descr: dn42 tinc cloud #1 keyset member: UVES-TINC admin-c: DUMMY-DN42 -tech-c: DUMMY-DN42 +tech-c: DUMMY-DN42 mnt-by: NIXNODES-MNT diff --git a/data/tinc-keyset/SET-3-DN42-TINC b/data/tinc-keyset/SET-3-DN42-TINC deleted file mode 100644 index 3ba4ad78c..000000000 --- a/data/tinc-keyset/SET-3-DN42-TINC +++ /dev/null @@ -1,6 +0,0 @@ -tinc-keyset: SET-3-DN42-TINC -descr: dn42 tinc cloud #3 keyset -member: STEPHANJ-TINC -member: XUU-TINC -admin-c: DUMMY-DN42 -mnt-by: NIXNODES-MNT