From f4d55cd226c510a67d4ca4a5575813dddb377833 Mon Sep 17 00:00:00 2001 From: ka-ba Date: Fri, 22 Aug 2014 01:16:32 +0200 Subject: [PATCH 001/132] introducing Wiebaden, preparing Mainz to new joint net version (Gluon) --- hosts/mainz1 | 4 ++-- hosts/mainz2 | 2 -- hosts/wiesbaden1 | 10 ++++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 hosts/wiesbaden1 diff --git a/hosts/mainz1 b/hosts/mainz1 index 375ceda..716cd3f 100644 --- a/hosts/mainz1 +++ b/hosts/mainz1 @@ -1,5 +1,5 @@ -Address = gate2.freifunk-mainz.de -Port = 656 +Address = 94.23.58.68 +Port = 10655 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAufGn5fV5dXxyQ75F1SARYxe3/7dDgcAsLp2IB8hXlQ6GGw/viYhF vMR66Xg/sy1IcJspwxYQ8KWTC0062rpZlQ0c6kR77LlVXLQgjAF+tPUAbmxt4/tL diff --git a/hosts/mainz2 b/hosts/mainz2 index 96a1cfd..5ecf8b8 100644 --- a/hosts/mainz2 +++ b/hosts/mainz2 @@ -1,5 +1,3 @@ -Address = icvpnmz1.noip.me -Port = 656 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA4etejQVw/F3c5TlL8vHuO0dxdyPem+8yV6VUu++uexbGpwB6mMQV RDImqz9KM6AND5wSH2kcO9qmY+q5Tg7VmGvITYvVZWwaSihqKVcCj2lgQUUrn2IO diff --git a/hosts/wiesbaden1 b/hosts/wiesbaden1 new file mode 100644 index 0000000..2acb502 --- /dev/null +++ b/hosts/wiesbaden1 @@ -0,0 +1,10 @@ +Address = 176.9.204.70 +Port = 10655 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwGbnNJm4sKnR51MP9hIBwFYfVbC8pVrlPyqk8wCn2GHKBYAEUW9u +zASjgcDdDFsx6mbRMMouFJa8UmZRtxHHGnURxdqnt3yE/63+5gSGARsjXPoGfqen +SLStn8v0Kf1UommPMUtVH4lmpjGk65f6ESB9DQDEYhLl/XU2YKJhXo2ZrVypW/EI +ZJ3hi8PdEpNrv3EiFqpJBgBff7CP+0/5+PrEckYsLHf8WCrCbXY8vIOZmACZl7IO +Xyslv3y6rWOTWHLUuH+mLAC4+6EIlX0I6qHB7HqJyQGLNpir6Bk6WypiuR9V0UST +8pRNXHmxJw+bL74lFFElcTNnmfr6uqx+oQIDAQAB +-----END RSA PUBLIC KEY----- From 3861d4ddc235bdb31487208a690d5b98ade5b860 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sat, 23 Aug 2014 14:36:52 +0200 Subject: [PATCH 002/132] Added flensburg1 --- hosts/flensburg1 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/flensburg1 diff --git a/hosts/flensburg1 b/hosts/flensburg1 new file mode 100644 index 0000000..49f9fe1 --- /dev/null +++ b/hosts/flensburg1 @@ -0,0 +1,10 @@ +Address = fl1.icvpn.freifunk-flensburg.de +Port = 656 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAv9Ow8Vkxo03MaYxxpdjQ1/tce2BgyON3+HkHd7/s90wovB6kkFpY +jL+c6nqN8kIBPhAw4Ibz6HmwUm6GIgappkwI2B81TTfrF2k4LR0NX+Nbyw2UqpnF +mt4O4ZRDBoRPRJxyXHgxLox0/VqEH+F044nO5DVaCJihlDDVnmjqvdvazBLjsTrX +d08gPKkyD/VdUMaX6d5eZOfxzRiPYMpZE0rWMzQc+n1kvw1DXfk/jhawqf4ZpaH3 +TD/DGzeuXnDjL2IxMYXHABdfZUug2r7eoP38UM7jVop32SVXQO95gBDs5hTzp9Wh +JdSYnxO3HgIRb+0g3a7Aq9KBBlQ6xCfZjwIDAQAB +-----END RSA PUBLIC KEY----- From fb4b6196f959d58e31bebb59478c1cb248e0c2d3 Mon Sep 17 00:00:00 2001 From: Philip Berndroth Date: Tue, 26 Aug 2014 12:19:29 +0200 Subject: [PATCH 003/132] add ruhrgebiet1 --- hosts/ruhrgebiet1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hosts/ruhrgebiet1 diff --git a/hosts/ruhrgebiet1 b/hosts/ruhrgebiet1 new file mode 100644 index 0000000..e69de29 From 0a596451b53a4b3c30becedb387c92644eb8b2ad Mon Sep 17 00:00:00 2001 From: DaCHRIS Date: Tue, 26 Aug 2014 12:21:02 +0200 Subject: [PATCH 004/132] Update ruhrgebiet1 --- hosts/ruhrgebiet1 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hosts/ruhrgebiet1 b/hosts/ruhrgebiet1 index e69de29..afa4320 100644 --- a/hosts/ruhrgebiet1 +++ b/hosts/ruhrgebiet1 @@ -0,0 +1,11 @@ +Address = bb0.freifunk-ruhrgebiet.de +Port = 1656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwDVWPbJlHAlDn5rb3Y/tAekiPJoKnTaV4u1+8YBDMf5wuqWOJdwm +5EWomX+R+8nEZELMU9DGFDhwu2kbhZOadsqUHmmFS3rMR9ObGsP3sQmFT334lAtn +oSCeJeDqMFNn9aaIxuSgirsPfMy3+v6XPatFvVSEjF1ph8nV3KU6Y/xHGrmAIg6T +FV5AGnW8lXq7qC29WhoecAxrD6hlJeGNtKo+9xs2/WFlEbpilSbVupo6xqABdQFL +uXOi7MhRn9OB22AX3Sn7qpzZluEXYftNNvd+T8h3IQJUOLuMszGuyU9o19lU3PAq +im5GL0kw1rIih4DqXnQQg73owvE5HulcFwIDAQAB +-----END RSA PUBLIC KEY----- From 55248bb1d459201188bcc107d2f10554e9eb9272 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Thu, 28 Aug 2014 21:46:27 +0200 Subject: [PATCH 005/132] Update key of kiel2 --- hosts/kiel2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hosts/kiel2 b/hosts/kiel2 index 2de15bf..67a2736 100644 --- a/hosts/kiel2 +++ b/hosts/kiel2 @@ -1,9 +1,9 @@ Address=vpn3.freifunk.in-kiel.de -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEArZ/JxDJmedQeibEssTLOZ8tzt81yIiesdL2Ko4D61vNiAzvVGjdm -ynDRk7pvESNsuKUvGKOqNoMgyh4xTnENxdRSMid0sUhOiUqa5sAh7x8t7ChEtHIU -mWnFrWLwTsZU5FXbiZdti8jKmOaGGAyrpx2zT64eUh/B+pERmf2zm4FswP9V57vu -ZMpZSTiWFH4cBTNYA9r5JsrU+5OLZvvCoA3awrMO+6f0l8tX3E8cEVmD7vX0IP0D -QZKMIUWOlHKH9bUPN7tAvDGWkzJJun8rNxpc9GHVtDpgOzmz/vy8M8YuSlKTj5D3 -oyAOsYe94mY2jXn9gZnzR7vTfjRNdwbhTwIDAQAB +MIIBCgKCAQEAqDth8oT1QRrt1usUz2qb+QfWCrva67Vup3TOuV1Lf6Zo6veRDOcT +3jCQtQ+BYGAiLgwhrYtJ13oiMlTbpd32ns1dvp5BgaiTWexJuObsC04LVry0kML5 +WyoInGpUD26sqPdXtcs9bAgNzkDCm7cxMtQiu4SGWyNYpfkkIb+4miUKyjnWCrqi +nWTX2KC4MJh7AMWSrk6vX7aYmV/qmHkIXBqhPKe0Ah6rufc8+ZkSATJJxTM78qwD +sOO78I3V6av1+QlaF9wCr5/X/eAD6XUEOJWPuiTflC27mDcihW2NE2YwCIDX8vk0 +Ccuo6OGrjJpZz+ncEjCcFICPpKrL8kYCdwIDAQAB -----END RSA PUBLIC KEY----- From e83fe9a4441c4f7d9947aa9025a644dfc1936e5f Mon Sep 17 00:00:00 2001 From: Felix Oertel Date: Sat, 30 Aug 2014 19:29:28 +0200 Subject: [PATCH 006/132] add key of flensburg2 --- hosts/flensburg2 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 hosts/flensburg2 diff --git a/hosts/flensburg2 b/hosts/flensburg2 new file mode 100755 index 0000000..afa6058 --- /dev/null +++ b/hosts/flensburg2 @@ -0,0 +1,11 @@ +Address = icvpn.fffl.wlan-fabrik.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAmdCnw5k8VOiHXKCVJOmIj4CpaazcaA7O/R5U6hcfd8gDrtVwAVNV +g+3leyocNYhJa0HPXZzSqzXQ8Bpfe/hHpdBp9/1Nz2Gx+YNcPKbCu1/KGkXH+Q8E +Z+tDtMEkj2fpGFhdsa4EDEnWMJwierHsW/tXkFym++vzLpPVRytKRtz/2OmjRiV5 +HDsVBam+6GmdXeDGqVRt0M8lY2Fd+x7UqwB/odAD6IbEExPZmvGWbxs5jx+rSEb6 +bqFvLzR1aQ//Ze84BzLP5wfVQvZNSRf1REA2IiFIxUjpous6qd0HzDtOOxEre4aE +RWh9UB5NycNVipLkcxyqrx/2mqN69aFLIwIDAQAB +-----END RSA PUBLIC KEY----- From 954cf0da5aa8af1b6e1f32df4a57dccc078b2034 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sun, 31 Aug 2014 13:04:00 +0200 Subject: [PATCH 007/132] Clean up unresolvable peers Comment out the Address= and Port= lines in the host definitions for all hosts that aren't resolvable. This causes tinc to not attempt any outgoing connection even though ConnectTo= is given, but enables them to connect to us. --- hosts/Treuenbrietzen | 2 +- hosts/aurich1 | 2 +- hosts/badzwischenhahn1 | 4 ++-- hosts/castrop1 | 2 +- hosts/flensburg2 | 0 hosts/grossdraxdorf | 4 ++-- hosts/halle2 | 2 +- hosts/hannover1 | 2 +- hosts/koblenz1 | 2 +- hosts/ljubljana2 | 2 +- hosts/schwarzach1 | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) mode change 100755 => 100644 hosts/flensburg2 diff --git a/hosts/Treuenbrietzen b/hosts/Treuenbrietzen index 512c04f..3bc18a0 100644 --- a/hosts/Treuenbrietzen +++ b/hosts/Treuenbrietzen @@ -1,4 +1,4 @@ -Address = shonyt.mine.nu +#Address = shonyt.mine.nu -----BEGIN RSA PUBLIC KEY----- MIGJAoGBANbR3LhhWFNt9ak//ZTReEuNQHjibgTAM+cNTDwLevudrP3y9htxTzgF UZDHnkbDqwrYNjnuaMLIik7ljj5aKQd+fXmv3S+sFvvaPnm+e7Fpt+r/ReTnS6su diff --git a/hosts/aurich1 b/hosts/aurich1 index c0b000a..a36d464 100644 --- a/hosts/aurich1 +++ b/hosts/aurich1 @@ -1,4 +1,4 @@ -Address = vpn.freifunk-aurich.de +#Address = vpn.freifunk-aurich.de -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAMTmDsazE1oEcjoMdiVtRtRyY1YX13DtK7O3sYdNMUjQA1Zn+OgDPRxm okwOAvT6ZqWr9xLmYWose3Vh7x4wuuNRuGaKgbB0bqWGWBlYeaqTTKGT9V/eJalj diff --git a/hosts/badzwischenhahn1 b/hosts/badzwischenhahn1 index 07cb608..b5ae63c 100644 --- a/hosts/badzwischenhahn1 +++ b/hosts/badzwischenhahn1 @@ -1,5 +1,5 @@ -Address = ffbz.ath.cx -Port = 655 +#Address = ffbz.ath.cx +#Port = 655 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAMlCF8Yj3adfH6Mssc7J59CMIzO4ZTa4meHXDaGWHXzGIMnUWRUlLIfp 7sa/uJ4U9iQU3ZEwv1cPWweDvWrG1HNL+oJEVv7xQWcBXaYnm0le305qom0E0U5U diff --git a/hosts/castrop1 b/hosts/castrop1 index 79c61a8..b2e0df1 100644 --- a/hosts/castrop1 +++ b/hosts/castrop1 @@ -1,4 +1,4 @@ -address = ffcas.no-ip.info +#Address = ffcas.no-ip.info -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAr1d6XRKMLgt853J8qxguOb017hjVSB4LNWKiLEXk1K5B4sPBP3Sj 6/3PjI38dbZsmWqOV6azMmqTeBjBKt1Ii02sfrIB0hc3JuwcCeLLrPtmxUWCIXon diff --git a/hosts/flensburg2 b/hosts/flensburg2 old mode 100755 new mode 100644 diff --git a/hosts/grossdraxdorf b/hosts/grossdraxdorf index 01595c6..f8073a5 100644 --- a/hosts/grossdraxdorf +++ b/hosts/grossdraxdorf @@ -1,5 +1,5 @@ -Address = ffgdd.ath.cx -Port = 655 +#Address = ffgdd.ath.cx +#Port = 655 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAKhb22phgEM0fsbvIiqKRp4RgPd3N7mPAFtF0R55wyrw8QUyRJ/M0TKE jJQKw8UVlmGNBcvjdLJQLowDhNn/3cob000ADVHaFrOlniwnlr4xw8FvARvdll8S diff --git a/hosts/halle2 b/hosts/halle2 index c3d6de6..e15833c 100644 --- a/hosts/halle2 +++ b/hosts/halle2 @@ -1,4 +1,4 @@ -Address = ffvpn2.3dfxatwork.de +#Address = ffvpn2.3dfxatwork.de -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA0F40mEg2vW9emNFi/Sr10rN4d/+O6VGLKjHGfMtUXxM9xILBlbDt Tid/mB5eOJu6CjXxLAlxrx0Ppm49jooD0BJz/Ajk7Xr2FX1pDxCAxwBBGj2iruy4 diff --git a/hosts/hannover1 b/hosts/hannover1 index df36466..95a691b 100644 --- a/hosts/hannover1 +++ b/hosts/hannover1 @@ -1,4 +1,4 @@ -Address = vpn.hannover.freifunk.net +#Address = vpn.hannover.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAJsf2VLpTQlglzwBWe2B9RIgTEl4Y2a22Xt0DMPRw2vRc4aLcYh9G9TC IvlXl87TKILdkZ8jlK9cMmwupAmtoxlRUCDkode1dqZ/Knf+iIOCP3jBPDggKKcR diff --git a/hosts/koblenz1 b/hosts/koblenz1 index fe5ab17..52e3e23 100644 --- a/hosts/koblenz1 +++ b/hosts/koblenz1 @@ -1,4 +1,4 @@ -Address=dsserver.homelinux.org +#Address=dsserver.homelinux.org -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsnls6tKZlZLjmOhjiMTh63GbOaEJ5L3/N4WQPNZN67YOoL0ISECv QeQ/p/3iRRhN4EG58CxAJ0X8uqpjqP6xLcbBSDfLbAawjFzU7OrKWiCAmHeW5ZTk diff --git a/hosts/ljubljana2 b/hosts/ljubljana2 index f598c95..0a39b02 100644 --- a/hosts/ljubljana2 +++ b/hosts/ljubljana2 @@ -1,4 +1,4 @@ -address = AS64768.linuxshell.org +#Address = AS64768.linuxshell.org -----BEGIN RSA PUBLIC KEY----- MIGJAoGBALVdchpMeSOA0JBBLwMMdX7hVMlLI2nXZ/0+b8R+36chmsajbKjsDa04 aw/t/YFo7iLFi3AAXj7Tm/8AXkRz6Rf93rplwo91k47Dz4iEwC/kn7kI8wrGyaTY diff --git a/hosts/schwarzach1 b/hosts/schwarzach1 index 46ce3b2..2bc46bf 100644 --- a/hosts/schwarzach1 +++ b/hosts/schwarzach1 @@ -1,4 +1,4 @@ -Address = schwarzach1.hopto.org +#Address = schwarzach1.hopto.org -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEApZQmRinQZQq7gPjFmltgFxXAv4REhkCAGcPwYl3uUeOwqe4adSDu From 001efbd180616a635e0bd2da948603bf7de0c0a5 Mon Sep 17 00:00:00 2001 From: thomasDOTde Date: Sun, 31 Aug 2014 14:25:15 +0200 Subject: [PATCH 008/132] Key fuer Moehne hinzugefuegt --- hosts/moehne0 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/moehne0 diff --git a/hosts/moehne0 b/hosts/moehne0 new file mode 100644 index 0000000..9bf2b87 --- /dev/null +++ b/hosts/moehne0 @@ -0,0 +1,15 @@ + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEApOhvm7ohievOIunqK7L2zb1Y40msF65qvwRzLr58x9byIp3pw7Ay +u/wB/U35D5kVOroV6Ar6u4O4HjVdJD+aAPC/w175R+E4tiSfvH9qMwKuL5vBnolJ +K6tHUHSEN783Xd4KXLjf+BQQ7IDQIMXsbhqqwBPqtC29Y8RFTpon+m4DkbHT07jj +R7XieIIlEFjbooFOSf62AyhBO5HzNVunIxg+LuZvy0LnO1rCpdqRXu0PqrftrXWv +Q1nRw23mXrEmpVH6Mu+0xNWMwpWRsyXSY+NPFOrhOx/Yw8PoF8PtnZC4+YRvkVvg +VITfgH6WmGRrnB4gJL1912nfqXw/yWtbtubJMARhO8HrMQNvXnlBWdP+o7hBXEPx +NLMypTmkQXMvZ9LPGifsyPGvU5vaYFnZO5bYRIrrtPvqr56itFpLh4getBK6OUTY +iNRcd74VmVrrdRgIaiR9v7Sm9qc1krUZSGQSoKUC5tWhS5VVxh/pzmHJu2mGdHqk +xw+41dAVrURsHwS+Tozqg9Z5g6P51+P3WlQz4dY02bw/zGOKV6CBJvv8+t3OPyNH +xQkprFWzIi1R20EzprDVChrg8dRt//hdwm2o9mRHL7cdkYYAXewIJrgPkUAT4aOX +FwPyncKXmmrWAQrN4hQagXoVbYkMt2fHRO3aZvEH/Ub/SJj+P4464lMCAwEAAQ== +-----END RSA PUBLIC KEY----- + From 1ab3d9162f9281d185524923e242197a73ab0179 Mon Sep 17 00:00:00 2001 From: thomasDOTde Date: Sun, 31 Aug 2014 14:56:53 +0200 Subject: [PATCH 009/132] Key fuer Monitoring hinzugefuegt Ansprechpartner thomas@drewermann.org --- hosts/monitoring-moehne | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/monitoring-moehne diff --git a/hosts/monitoring-moehne b/hosts/monitoring-moehne new file mode 100644 index 0000000..9bf2b87 --- /dev/null +++ b/hosts/monitoring-moehne @@ -0,0 +1,15 @@ + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEApOhvm7ohievOIunqK7L2zb1Y40msF65qvwRzLr58x9byIp3pw7Ay +u/wB/U35D5kVOroV6Ar6u4O4HjVdJD+aAPC/w175R+E4tiSfvH9qMwKuL5vBnolJ +K6tHUHSEN783Xd4KXLjf+BQQ7IDQIMXsbhqqwBPqtC29Y8RFTpon+m4DkbHT07jj +R7XieIIlEFjbooFOSf62AyhBO5HzNVunIxg+LuZvy0LnO1rCpdqRXu0PqrftrXWv +Q1nRw23mXrEmpVH6Mu+0xNWMwpWRsyXSY+NPFOrhOx/Yw8PoF8PtnZC4+YRvkVvg +VITfgH6WmGRrnB4gJL1912nfqXw/yWtbtubJMARhO8HrMQNvXnlBWdP+o7hBXEPx +NLMypTmkQXMvZ9LPGifsyPGvU5vaYFnZO5bYRIrrtPvqr56itFpLh4getBK6OUTY +iNRcd74VmVrrdRgIaiR9v7Sm9qc1krUZSGQSoKUC5tWhS5VVxh/pzmHJu2mGdHqk +xw+41dAVrURsHwS+Tozqg9Z5g6P51+P3WlQz4dY02bw/zGOKV6CBJvv8+t3OPyNH +xQkprFWzIi1R20EzprDVChrg8dRt//hdwm2o9mRHL7cdkYYAXewIJrgPkUAT4aOX +FwPyncKXmmrWAQrN4hQagXoVbYkMt2fHRO3aZvEH/Ub/SJj+P4464lMCAwEAAQ== +-----END RSA PUBLIC KEY----- + From 76d4a5b1bca1873fa0566a7970e4b9c9c982f2c1 Mon Sep 17 00:00:00 2001 From: thomasDOTde Date: Sun, 31 Aug 2014 15:00:46 +0200 Subject: [PATCH 010/132] =?UTF-8?q?Key=20f=C3=BCr=20Monitoring=20eingef?= =?UTF-8?q?=C3=BCgt=20Ansprechpartner=20hallo@freifunk-moehne.de?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/moehne0 | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 hosts/moehne0 diff --git a/hosts/moehne0 b/hosts/moehne0 deleted file mode 100644 index 9bf2b87..0000000 --- a/hosts/moehne0 +++ /dev/null @@ -1,15 +0,0 @@ - ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEApOhvm7ohievOIunqK7L2zb1Y40msF65qvwRzLr58x9byIp3pw7Ay -u/wB/U35D5kVOroV6Ar6u4O4HjVdJD+aAPC/w175R+E4tiSfvH9qMwKuL5vBnolJ -K6tHUHSEN783Xd4KXLjf+BQQ7IDQIMXsbhqqwBPqtC29Y8RFTpon+m4DkbHT07jj -R7XieIIlEFjbooFOSf62AyhBO5HzNVunIxg+LuZvy0LnO1rCpdqRXu0PqrftrXWv -Q1nRw23mXrEmpVH6Mu+0xNWMwpWRsyXSY+NPFOrhOx/Yw8PoF8PtnZC4+YRvkVvg -VITfgH6WmGRrnB4gJL1912nfqXw/yWtbtubJMARhO8HrMQNvXnlBWdP+o7hBXEPx -NLMypTmkQXMvZ9LPGifsyPGvU5vaYFnZO5bYRIrrtPvqr56itFpLh4getBK6OUTY -iNRcd74VmVrrdRgIaiR9v7Sm9qc1krUZSGQSoKUC5tWhS5VVxh/pzmHJu2mGdHqk -xw+41dAVrURsHwS+Tozqg9Z5g6P51+P3WlQz4dY02bw/zGOKV6CBJvv8+t3OPyNH -xQkprFWzIi1R20EzprDVChrg8dRt//hdwm2o9mRHL7cdkYYAXewIJrgPkUAT4aOX -FwPyncKXmmrWAQrN4hQagXoVbYkMt2fHRO3aZvEH/Ub/SJj+P4464lMCAwEAAQ== ------END RSA PUBLIC KEY----- - From fff313a48adf932b3129c2e7a21a98c1e6cf41b2 Mon Sep 17 00:00:00 2001 From: thomasDOTde Date: Sun, 31 Aug 2014 16:24:45 +0200 Subject: [PATCH 011/132] monitoring-moehne in monitoringmoehne wegen tinc Einschraenkung umbenannt --- hosts/{monitoring-moehne => monitoringmoehne} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hosts/{monitoring-moehne => monitoringmoehne} (100%) diff --git a/hosts/monitoring-moehne b/hosts/monitoringmoehne similarity index 100% rename from hosts/monitoring-moehne rename to hosts/monitoringmoehne From fb5735b4f0701b7d2bd461238c602347c93f7172 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Mon, 1 Sep 2014 12:39:46 +0200 Subject: [PATCH 012/132] removed aurich --- hosts/aurich1 | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 hosts/aurich1 diff --git a/hosts/aurich1 b/hosts/aurich1 deleted file mode 100644 index a36d464..0000000 --- a/hosts/aurich1 +++ /dev/null @@ -1,6 +0,0 @@ -#Address = vpn.freifunk-aurich.de ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAMTmDsazE1oEcjoMdiVtRtRyY1YX13DtK7O3sYdNMUjQA1Zn+OgDPRxm -okwOAvT6ZqWr9xLmYWose3Vh7x4wuuNRuGaKgbB0bqWGWBlYeaqTTKGT9V/eJalj -n3of5UZQkTDpYHd4RWNRbYKT69sLfR4/8gmp4EUbAPD4JRBrUGPvAgMBAAE= ------END RSA PUBLIC KEY----- From 2fefa1a1b06369333b6a2f6e4159e65c29a34012 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Mon, 1 Sep 2014 13:22:36 +0200 Subject: [PATCH 013/132] kiel: Rename kiel2 to kiel3, remove old kiel3. The former Kiel3 host is going to be dropped, since the host known as kiel2 is locally known as vpn3 it is sound for our numbering scheme to rename it in this way. --- hosts/kiel2 | 9 --------- hosts/kiel3 | 14 +++++++------- 2 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 hosts/kiel2 diff --git a/hosts/kiel2 b/hosts/kiel2 deleted file mode 100644 index 67a2736..0000000 --- a/hosts/kiel2 +++ /dev/null @@ -1,9 +0,0 @@ -Address=vpn3.freifunk.in-kiel.de ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAqDth8oT1QRrt1usUz2qb+QfWCrva67Vup3TOuV1Lf6Zo6veRDOcT -3jCQtQ+BYGAiLgwhrYtJ13oiMlTbpd32ns1dvp5BgaiTWexJuObsC04LVry0kML5 -WyoInGpUD26sqPdXtcs9bAgNzkDCm7cxMtQiu4SGWyNYpfkkIb+4miUKyjnWCrqi -nWTX2KC4MJh7AMWSrk6vX7aYmV/qmHkIXBqhPKe0Ah6rufc8+ZkSATJJxTM78qwD -sOO78I3V6av1+QlaF9wCr5/X/eAD6XUEOJWPuiTflC27mDcihW2NE2YwCIDX8vk0 -Ccuo6OGrjJpZz+ncEjCcFICPpKrL8kYCdwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/kiel3 b/hosts/kiel3 index e7110f0..67a2736 100644 --- a/hosts/kiel3 +++ b/hosts/kiel3 @@ -1,9 +1,9 @@ -Address = freifunk.in-kiel.de +Address=vpn3.freifunk.in-kiel.de -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAmeK4Al2ivNdnbAiPyM4jxFIGAKpjowGoiHUA+eN10OViIPf3R4hH -sGhkUuXddAoq2meE5cNix7lMMmeE3npbKR5r61a9mqjPm8sfrjdBOjYnlEFoGlN3 -Ck/XUpm6BC6Dl3yvbPRrClochjIvQUbUKMma4q7/4sMRzCgx0eykL2UgocBkTgp6 -scZrPc2a3uLAA89r7EWQTn8rVgY8mlVt0evCwsQg84OrPSYCsrDYWQh7sTQxsnTV -c1dnr5PceG3zAHdd337XqkN0UgyAX4tTuxxTYv5Q1uqF1mGaXrKh/tIynZ5NiCfk -Qfe1/3phtF2tgPF4fGBrBi3uRVLt51qCAQIDAQAB +MIIBCgKCAQEAqDth8oT1QRrt1usUz2qb+QfWCrva67Vup3TOuV1Lf6Zo6veRDOcT +3jCQtQ+BYGAiLgwhrYtJ13oiMlTbpd32ns1dvp5BgaiTWexJuObsC04LVry0kML5 +WyoInGpUD26sqPdXtcs9bAgNzkDCm7cxMtQiu4SGWyNYpfkkIb+4miUKyjnWCrqi +nWTX2KC4MJh7AMWSrk6vX7aYmV/qmHkIXBqhPKe0Ah6rufc8+ZkSATJJxTM78qwD +sOO78I3V6av1+QlaF9wCr5/X/eAD6XUEOJWPuiTflC27mDcihW2NE2YwCIDX8vk0 +Ccuo6OGrjJpZz+ncEjCcFICPpKrL8kYCdwIDAQAB -----END RSA PUBLIC KEY----- From ed5b0d755b7ebe90504a44e64fd63702078e2025 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Mon, 1 Sep 2014 13:23:16 +0200 Subject: [PATCH 014/132] kiel: The private keys of kiel4 are lost. Furthermore the host is no longer available. --- hosts/kiel4 | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 hosts/kiel4 diff --git a/hosts/kiel4 b/hosts/kiel4 deleted file mode 100644 index b3145b3..0000000 --- a/hosts/kiel4 +++ /dev/null @@ -1,10 +0,0 @@ -Address = vpn.sys.ccs-baumann.de -Port = 656 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA5c9ilZOeCjcwV3S6z3hemdU7V8mkLYtcSt9M9g7Y7VkOPFy8sPl1 -Wn4MqdprNSXrLdhkFSxeaKAYbs9HrzPu4jS+7XD7Ezdy+7GOo2IghBngtUL4BTGf -ZCnRNRObovtB6o2x4Rxbl0aaIEy0aOkMOsLUXH50tyeCcnJTLsHQTuNqOSG32KWO -RQLTJeIzl39RcECarJS8NVYWdH1HiZSFRQGq+W3eS/tMXm3+CGAzZk4ZxGd+nb7N -9bqnZAYNdQ6jfEIYICR8yglHCroGsa8tRy0Frk6b09P2LnCSvOo2lMiYMu4upAkr -zVoyqPXEOXNrPDTaTQP9h0+MeOfqvfPFRwIDAQAB ------END RSA PUBLIC KEY----- From 002343b9710807f855c596a8d6fb15c14c15a453 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Mon, 1 Sep 2014 13:23:43 +0200 Subject: [PATCH 015/132] kiel: Update dynamic domain name --- hosts/kiel1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/kiel1 b/hosts/kiel1 index 9d8e6d3..41a60e8 100644 --- a/hosts/kiel1 +++ b/hosts/kiel1 @@ -1,4 +1,4 @@ -Address = medusa.dyndns.toppoint.de +Address = medusa.dynamic.toppoint.de -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAwTcMQ2KE8zQRNcYd9/ivnybAY0M72j2+5fbYPZk2puMPURy5hFLk nMiF3r7N7OuVoK3zBjlBHdjbRuarheYLFHqZo6TTjxmqZOMytgjuLiCC1DRnPKSg From 579794152f9685b7d5a5ee906057f35d5c4b7927 Mon Sep 17 00:00:00 2001 From: Ralf Heiringhoff Date: Wed, 3 Sep 2014 15:06:59 +0200 Subject: [PATCH 016/132] rewrite post-merge to auto-generate tinc config --- scripts/post-merge | 59 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/scripts/post-merge b/scripts/post-merge index 373c349..b8fe8b5 100644 --- a/scripts/post-merge +++ b/scripts/post-merge @@ -1,10 +1,57 @@ #!/bin/bash -# post-merge hook für Debian um tinc zu reloaden +# post-merge hook for Debian systems +# +# 1. copy to .git/hooks +# 2. to test run "git pull -q" +# 3. create cronjob, which runs "git pull -q" in your ${icvpn} dir # -# 1. nach .git/hooks kopieren -# 2. git pull -q ausführen zum testen -# 3. cronjob erstellen, der git pull -q im richtigen -# Verzeichnis ausführt -/etc/init.d/tinc reload icvpn +icvpndir=/etc/tinc/icvpn/ +tinccfg=tinc.conf +export icvpndir tinccfg + +PATH="/sbin:/bin:/usr/sbin:/usr/bin" +tmpfile=$(mktemp) +export PATH tmpfile + +# get changed files +changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)" + +# run $2 if $1 matches changed files +check_run() { + echo "$changed_files" | grep --quiet "$1" && eval "$2" +} + +# generate ${tinccfg} +gen_conf() { + test -w ${icvpndir}/${tinccfg} || \ + { echo "ERR: ${tinccfg} (${icvpndir}/${tinccfg}) is not writeable, exiting." >&2; exit 1; } + + # remove all ConnectTo Statements + grep -v 'ConnectTo' ${icvpndir}/${tinccfg} > ${tmpfile} + # add ConnectTo Statements for all hosts + for host in ${icvpndir}/hosts/[a-zA-Z]*; do + echo "ConnectTo = ${host##*/}" >> ${tmpfile} + done + + test -s ${tmpfile} || \ + { echo "ERR: generated config was empty, zeh sky is falling, exiting." >&2; exit 2; } + + num_connectto=$(grep -s ConnectTo ${tmpfile} | wc -l) + [ ${num_connectto} -gt 20 ] || \ + { echo "ERR: generated config has ${num_connectto} <= 20 ConnectTo lines, safety 1st, exiting." >&2; exit 30; } + num_all=$(cat ${tmpfile} | wc -l) + [ ${num_all} -gt 25 ] || \ + { echo "ERR: generated config has ${num_all} <= 25 lines, safety 1st, exiting." >&2; exit 31; } + + cp -f ${icvpndir}/${tinccfg} ${icvpndir}/${tinccfg}.old + cat ${tmpfile} > ${icvpndir}/${tinccfg} + + invoke-rc.d tinc reload icvpn +} + +check_run hosts/[a-zA-Z] gen_conf + +rm -f ${tmpfile} +exit 0 From 0c43a633e806a8235633c09a4c3ae988ca0acdf6 Mon Sep 17 00:00:00 2001 From: Christian Roeder Date: Wed, 3 Sep 2014 23:52:54 +0200 Subject: [PATCH 017/132] add darmstadt1 --- hosts/darmstadt1 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/darmstadt1 diff --git a/hosts/darmstadt1 b/hosts/darmstadt1 new file mode 100644 index 0000000..a0d26c8 --- /dev/null +++ b/hosts/darmstadt1 @@ -0,0 +1,15 @@ +Address = gw01.icvpn.darmstadt.freifunk.net + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAsFBR3wzdRoFXDy38HQtlYDKHvsbY99fUkPZXxg5v3dBGIfWDWMBR +44C7OyLWKmF7cwZwOe+ITblJ05La43oEzLFLjRC9yC77nH+gHxC3yrqSJGENey3v +XSThNdcYGPzbrEVf55Nbo0GFbtvBJtXOdPc9q1HyobsDKVZ49T+sBttQBNgT75LL +o3/a3Par8QO4FfSiL2YkdjYIHYXaN3Knlssxfxso9DvJixlDxruHVuWeW5NKEzJ6 +qIjfy/sw9GW4YVygbxqxEsajo3SmU5mzOVYcUuEGMRnlNAvrbtpDf+5gXfyoW34J +2IuHw2LO2r+4M9Ek7llmS8HtHrNe44w18i3shePyINa0xHUFwv5qPrzWn9XXWbH+ +baxkP6U97afRsAhMOQ2EO8a5ZJG7qYDZom884ndD13BFkQjHh0yfKNQnyo4R+Ke8 ++PDPkig7Dg5mWMeodPiDJu6o6FE2fZLClG94dVvjP5IQjlZYIFmkjwnTgPNR96vE +/CERPrvIUPhbCIkT0JY4Dyfe56o6iNKHWJcxL4vhy8zwqPf3P1cwprtMRvp4eDPh +9NNq+Mjb7Nu6LWTvImb94L3wQ4xM6ngktE+DFUMvnuVTmJP1Cf1zkgLf0T6QNpA5 +wnMzgZU+q5IUkQA4660iM+8IyCaX5DKWpuRM/YRBryNApsuYJ+FsZNECAwEAAQ== +-----END RSA PUBLIC KEY----- From 730096b44a66a5a00214382c35ef7c6308759e9d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Sep 2014 23:56:58 +0200 Subject: [PATCH 018/132] Added darmstadt2 --- hosts/darmstadt2 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/darmstadt2 diff --git a/hosts/darmstadt2 b/hosts/darmstadt2 new file mode 100644 index 0000000..80e3f39 --- /dev/null +++ b/hosts/darmstadt2 @@ -0,0 +1,10 @@ +Address = gw02.icvpn.darmstadt.freifunk.net + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAuohUruR8enzVN1IswdzMuf8f3rY2HOK/yByItBcMHM9b4HMe6Jt6 +ojJLqbfS2wtDs/a42XuZjzf0Hg9VJqehDhcA7u5fKTYyJMbiFvkodCWeTzSIs+sE +vj2LIyqIV94sjrG7Pj0Np5hwy/kyoaj41LMoXcyKe73K5krurgxUtxxycWPfrvuB +RW9lc+6XTrDv3I6XdNTe0Nj9XRkdoUxzJXQfLHLUx/ynymD7w1325cf5JAVTW8YK +gZvUSZ+irwenMIc+qTv00z8THPQaB0wMoOfgEe8cA85sBxkAj8cOMzoiuUxjgk7/ +WSejxCFFpXe6uXLtdWKNAPWoYUq3EXNqrwIDAQAB +-----END RSA PUBLIC KEY----- From b2f40d0a766512d3a4915cc7f3af4a7d720db410 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Thu, 4 Sep 2014 13:29:31 +0200 Subject: [PATCH 019/132] refactor post-merge hook --- scripts/post-merge | 55 ++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 41 deletions(-) mode change 100644 => 100755 scripts/post-merge diff --git a/scripts/post-merge b/scripts/post-merge old mode 100644 new mode 100755 index b8fe8b5..dc97dd3 --- a/scripts/post-merge +++ b/scripts/post-merge @@ -4,54 +4,27 @@ # # 1. copy to .git/hooks # 2. to test run "git pull -q" -# 3. create cronjob, which runs "git pull -q" in your ${icvpn} dir +# 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/" # -icvpndir=/etc/tinc/icvpn/ -tinccfg=tinc.conf -export icvpndir tinccfg - -PATH="/sbin:/bin:/usr/sbin:/usr/bin" -tmpfile=$(mktemp) -export PATH tmpfile - -# get changed files -changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)" - -# run $2 if $1 matches changed files -check_run() { - echo "$changed_files" | grep --quiet "$1" && eval "$2" +fail() { + echo "$1" >&2 + exit 1 } -# generate ${tinccfg} -gen_conf() { - test -w ${icvpndir}/${tinccfg} || \ - { echo "ERR: ${tinccfg} (${icvpndir}/${tinccfg}) is not writeable, exiting." >&2; exit 1; } +BASE=$(git rev-parse --show-toplevel) +TINCCFG=$BASE/tinc.conf +test -w $TINCCFG || fail "ERR: $TINCCFG is not writeable" - # remove all ConnectTo Statements - grep -v 'ConnectTo' ${icvpndir}/${tinccfg} > ${tmpfile} - # add ConnectTo Statements for all hosts - for host in ${icvpndir}/hosts/[a-zA-Z]*; do - echo "ConnectTo = ${host##*/}" >> ${tmpfile} - done +sed -i '/^ConnectTo/d' $TINCCFG - test -s ${tmpfile} || \ - { echo "ERR: generated config was empty, zeh sky is falling, exiting." >&2; exit 2; } +for HOST in hosts/*; do + # skip hosts without address + grep -q '^Address' -- "$HOST" || continue - num_connectto=$(grep -s ConnectTo ${tmpfile} | wc -l) - [ ${num_connectto} -gt 20 ] || \ - { echo "ERR: generated config has ${num_connectto} <= 20 ConnectTo lines, safety 1st, exiting." >&2; exit 30; } - num_all=$(cat ${tmpfile} | wc -l) - [ ${num_all} -gt 25 ] || \ - { echo "ERR: generated config has ${num_all} <= 25 lines, safety 1st, exiting." >&2; exit 31; } + echo "ConnectTo = ${HOST##*/}" >> $TINCCFG +done - cp -f ${icvpndir}/${tinccfg} ${icvpndir}/${tinccfg}.old - cat ${tmpfile} > ${icvpndir}/${tinccfg} +invoke-rc.d tinc reload icvpn - invoke-rc.d tinc reload icvpn -} - -check_run hosts/[a-zA-Z] gen_conf - -rm -f ${tmpfile} exit 0 From 137c824d26d9f7d30d3795d6a6f55060f29c48a0 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Sat, 13 Sep 2014 23:05:10 +0200 Subject: [PATCH 020/132] kiel: Remove kiel1 The system is no longer acting as a icvpn peer --- hosts/kiel1 | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 hosts/kiel1 diff --git a/hosts/kiel1 b/hosts/kiel1 deleted file mode 100644 index 41a60e8..0000000 --- a/hosts/kiel1 +++ /dev/null @@ -1,9 +0,0 @@ -Address = medusa.dynamic.toppoint.de ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAwTcMQ2KE8zQRNcYd9/ivnybAY0M72j2+5fbYPZk2puMPURy5hFLk -nMiF3r7N7OuVoK3zBjlBHdjbRuarheYLFHqZo6TTjxmqZOMytgjuLiCC1DRnPKSg -TFgbNu6TsqI8WkIe2Y+kp3btpNb7JFUPsSoZJXI2BAzx1TcVQLLwvQcFQiGBle5E -wWNpS614VM/D5erNHovg4z0Iw//HEvoafpOuPJPrxyHl/sCnJQqikwLG1Wi7ocUY -cRzYjje94Ygu5BZ1nz4yYYQpa49RuD0dS8JF1p2UzPeUTfExWYBpX5uy73W9RKcW -8gSdrs1QkyXs4gta8/QMJmnXff98bl7vZwIDAQAB ------END RSA PUBLIC KEY----- From d31c8d7ffcd28d1503583991bf4c8b78e337f50f Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Sat, 20 Sep 2014 20:19:50 +0200 Subject: [PATCH 021/132] add braunschweig[12] --- hosts/braunschweig1 | 10 ++++++++++ hosts/braunschweig2 | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 hosts/braunschweig1 create mode 100644 hosts/braunschweig2 diff --git a/hosts/braunschweig1 b/hosts/braunschweig1 new file mode 100644 index 0000000..7fbe162 --- /dev/null +++ b/hosts/braunschweig1 @@ -0,0 +1,10 @@ +Address = gw1.freifunk-bs.de +Port = 655 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1SlHQTdW8wnYWpSRwZWx5BHOHm+0WzZNN96edmUqAi5hrVQwVCeI +ycmGtk4iOqyMPPynhVf/aM3huXNXI9ObCKau+QUsmEv7c30RId9J5WxvQ7qCejf/ +v/kGJF9B1LPtZ5v0bB1euxypty5g5SBdfQ2KhLHyRUiLqOTBenhoJmI/KNjGxC1P +A3IzGF2/3gtxbq6eRpdKRl8ZoEXuaLKzkBEM8mwh9QM9ybOXOd1nM3K4NCyB2Uej +Vuikr2sagN+GVZhZOV2HfCb7xVJUdEQCKRIDxzmUu4/NtZEmkGFqfce1EeFkvJmu +/XeUr8QRaIIPwirMNy47UCtD4Q2NQBjHVwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/braunschweig2 b/hosts/braunschweig2 new file mode 100644 index 0000000..7ff99c5 --- /dev/null +++ b/hosts/braunschweig2 @@ -0,0 +1,10 @@ +Address = gw2.freifunk-bs.de +Port = 655 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA3vOFU3pGxVUVHAEDeD4suiW8tUuwekWle8Tu9nx13BEepdZFof7m +sgqhJvbfqRE6JZDYCCzZPRT03xBNv88odzOqhgHSSg4qEB5/hGtdJGHBRZdGJd0x +XGYv/eHAH6nh2Dx7jJmYinRDC2IVrZkVtKEmQLSLgYAKhNw8BKRHqaxAjnYl2Ar+ +RITsxp1qcRxt2yt5AShN5APPzp2SSzV7HB4Xjq/D55WduwejPCen4SZnjrhgLdQM +kSJV31Mc3zlhmN5KSgkoCGbkky61XXehl4fXCEJ4maA0mmLU0AMHq1jRek0gI5n8 +VBefp/+MVxJ2cSE9EGuqRqB9b3DJOs3hTQIDAQAB +-----END RSA PUBLIC KEY----- From 4dcba5ca734ee0392359247ecff2158e4fc43d1e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 8 Oct 2014 11:10:51 +0200 Subject: [PATCH 022/132] muenchen added --- hosts/muenchen1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/muenchen1 diff --git a/hosts/muenchen1 b/hosts/muenchen1 new file mode 100644 index 0000000..5f2294a --- /dev/null +++ b/hosts/muenchen1 @@ -0,0 +1,11 @@ +Address = ffm.netz.org +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAn7jl+pcXgObhzpo77iAYNaXQ7xDPFkI3J1XBVP/4mlMWaNMRP/MX +rQn5AmECqrjp+iXgJHiZqO3V+SraYv402Ry1Q9nugKuF8oaY3kogsT2HNWlp5TsA +LtkQb4VLl6hMAYQ++y3lCG1URipQ5F+K2N5ofBJHAcqnSukgz2Fsn6gNs9nZHci2 +u7HYi0kpCLpqej9DyijNC1aCVF2HrkPq6P87CXnfZiWjbjGbiB2xj1GHmI5VdyvA +GBlt+Xpm09V0sy1YBwGEeqSRvhIiZbJFz2wr2kIVkv7ZRyn4OqnzXkml6Bnhc948 ++2whuRYgWXVWyK4tpFdIg9Oa1GeHt5QWvQIDAQAB +-----END RSA PUBLIC KEY----- From 372e5b73aa2d3d74f20efebef9bbaab803149bb7 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 8 Oct 2014 12:55:09 +0200 Subject: [PATCH 023/132] muenchen4 added --- hosts/muenchen4 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/muenchen4 diff --git a/hosts/muenchen4 b/hosts/muenchen4 new file mode 100644 index 0000000..5f2294a --- /dev/null +++ b/hosts/muenchen4 @@ -0,0 +1,11 @@ +Address = ffm.netz.org +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAn7jl+pcXgObhzpo77iAYNaXQ7xDPFkI3J1XBVP/4mlMWaNMRP/MX +rQn5AmECqrjp+iXgJHiZqO3V+SraYv402Ry1Q9nugKuF8oaY3kogsT2HNWlp5TsA +LtkQb4VLl6hMAYQ++y3lCG1URipQ5F+K2N5ofBJHAcqnSukgz2Fsn6gNs9nZHci2 +u7HYi0kpCLpqej9DyijNC1aCVF2HrkPq6P87CXnfZiWjbjGbiB2xj1GHmI5VdyvA +GBlt+Xpm09V0sy1YBwGEeqSRvhIiZbJFz2wr2kIVkv7ZRyn4OqnzXkml6Bnhc948 ++2whuRYgWXVWyK4tpFdIg9Oa1GeHt5QWvQIDAQAB +-----END RSA PUBLIC KEY----- From 42590066951b5416cebf8c173174c36d2a8f29ce Mon Sep 17 00:00:00 2001 From: suicider Date: Wed, 8 Oct 2014 13:09:31 +0200 Subject: [PATCH 024/132] Create erfurt1 --- hosts/erfurt1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/erfurt1 diff --git a/hosts/erfurt1 b/hosts/erfurt1 new file mode 100644 index 0000000..9162f1a --- /dev/null +++ b/hosts/erfurt1 @@ -0,0 +1,11 @@ +Address = sj.weimarnetz.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAyjO839sG3az3LDGyuc9V1zB/0WMFXwnc73yxNyk9QsL5isSab2D0 +ajdeF2IxqlGaOE1Go7mEgejlAL6Wb06jnll3j/QxDBrE2n1frmENLZjENZFdqWQo +EmL8f4deOiPZZVxX4KIUlNETbYUPMonW+tffFmaBiRQm6FhmSlcYXxSuttSFmxbF +If4apkQVeSyO6nNL2Vdzrd2XDnJvHq/7c7KMBHkczyG9LR9RBVAog8wpfFrIRqsV +Kmz9g6nHiEh5UcARsZqWDT2UnV8vwHJbxHwFLYg2Dnd+Xo8GOQgpw6jQlihjBfhn +8+D+K0hoPGkwH6VxTYi3TB2X/nGTnxA0vQIDAQAB +-----END RSA PUBLIC KEY----- From a288d1f92dda34d8663dfeba1c86693e717ce0b2 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 8 Oct 2014 15:24:09 +0200 Subject: [PATCH 025/132] key changed to match real muenchen1 --- hosts/muenchen1 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hosts/muenchen1 b/hosts/muenchen1 index 5f2294a..73b1c6e 100644 --- a/hosts/muenchen1 +++ b/hosts/muenchen1 @@ -1,11 +1,10 @@ -Address = ffm.netz.org +Address = gw01.freifunk-muenchen.de Port = 656 - -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAn7jl+pcXgObhzpo77iAYNaXQ7xDPFkI3J1XBVP/4mlMWaNMRP/MX -rQn5AmECqrjp+iXgJHiZqO3V+SraYv402Ry1Q9nugKuF8oaY3kogsT2HNWlp5TsA -LtkQb4VLl6hMAYQ++y3lCG1URipQ5F+K2N5ofBJHAcqnSukgz2Fsn6gNs9nZHci2 -u7HYi0kpCLpqej9DyijNC1aCVF2HrkPq6P87CXnfZiWjbjGbiB2xj1GHmI5VdyvA -GBlt+Xpm09V0sy1YBwGEeqSRvhIiZbJFz2wr2kIVkv7ZRyn4OqnzXkml6Bnhc948 -+2whuRYgWXVWyK4tpFdIg9Oa1GeHt5QWvQIDAQAB +MIIBCgKCAQEA20ydh6auuT+FCBp5RiOP0PxaH356/zx3YxO18q8bJFnVXIyrVhLO +QnhDGpEqYcccNMdmVPHQiroWsfOrNwBf69OyZobndbHVfFCC/HNtVl3EHPRClIeS +oIyGWvXpnXCrpCUfghNPhAt/JoUM5fkKkNA+/vyJzU+RTBu6A1h3HnGshDMDnt5T +Fe2J/8S00p0M8NjZiRyRMwhq8cx2XpK4rRN41Rr77Mafe6dhM9w73hCHp/GX1W8S +2wByI+yoUMz8ld35iYoKEVQkWapGrvG/4ZvSJkZw7dtwJuRxyoXdjCROKWsTPDnR +TIuD7yd4DSboEk9kCED4O4BPtMYFDIlkUwIDAQAB -----END RSA PUBLIC KEY----- From ad1a2b0445594493121d748525260af3ed605753 Mon Sep 17 00:00:00 2001 From: Pepto Date: Tue, 21 Oct 2014 14:55:34 +0200 Subject: [PATCH 026/132] Create dreilaendereck2 dreilaendereck gw2 added --- hosts/dreilaendereck2 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/dreilaendereck2 diff --git a/hosts/dreilaendereck2 b/hosts/dreilaendereck2 new file mode 100644 index 0000000..35848ab --- /dev/null +++ b/hosts/dreilaendereck2 @@ -0,0 +1,10 @@ +Address = gw2.freifunk-3laendereck.de +Port = 656 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA6KdvIDFhgFH7VVCMPZtn5RQd6dXtGLz/6vMWuak2rSHBzc8YFRho +hztyRrq1poGJDa6w7hTDzx1rwoF289qGt9bJVfwmsiEbKWKKD3yJkbiOGK2qVTEo +lmWP8ymNr83miYG+ZXS5ed6OL/bwTfMDL60HpKKoK8pbewpWOTcTcGfcsBts1bn9 +8iv0att4SBDrzaT+DHaz+DG0apTmVCP4LBZ5NK8l/GtRSH+Qbk8jQ4E+dZW0tJD1 +BOvo2TJ41hTp05xmoXk6r1wUY2VbbuMm4303X2cTEh1F91Jwx7ymjjZjXxVYF5C1 +sg9/UJN2VQUzo//InoY0KIf9jam5nkPxhQIDAQAB +-----END RSA PUBLIC KEY----- From c74c8319765c93147708805d3c29013a853effa0 Mon Sep 17 00:00:00 2001 From: BenJule Date: Wed, 22 Oct 2014 19:30:49 +0200 Subject: [PATCH 027/132] Added Gateway3 of Freifunk-3Laendereck --- hosts/dreilaendereck3 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/dreilaendereck3 diff --git a/hosts/dreilaendereck3 b/hosts/dreilaendereck3 new file mode 100644 index 0000000..bf28c61 --- /dev/null +++ b/hosts/dreilaendereck3 @@ -0,0 +1,11 @@ +Address = gw3.freifunk-3laendereck.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAriAC3ChanNKtXgp/Eu0EcTJTeAM8yp1D35SOM89hVgygYmy4woC0 +CEx6SbVFnwzL4Rar4+c4XXCDLq74AsHjTe7ulzvSDJ/acSoOVsXZ0Wnb5QUFYDlL +ue/2dp9TNHNRl/27OjBL+5fQM4LBvdImBJFKxuYtJc5ApB12LAIAx2y5FS0mp2rT +k2+HDZgaxanlUf6ecaFp8H7A5LiITig8nHUa9/0J5U5Q4ZzYoSnjQKiOKvaOWKX/ +RydUCrZyiyVl12tlEc/FcT//zj7XrNE8oHC9LaUWb6masCCzv0WR5Ck5XX3yC+/m +gsvjMK7c1I/tFjUQE07MO68qXCX2zzV14QIDAQAB +-----END RSA PUBLIC KEY----- From 48fa2bc453148274839fd1a3417be4e72e59ab86 Mon Sep 17 00:00:00 2001 From: knirps99 Date: Sat, 25 Oct 2014 19:07:17 +0200 Subject: [PATCH 028/132] Update mainz2 Add right address vor mainz2 --- hosts/mainz2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/mainz2 b/hosts/mainz2 index 5ecf8b8..f09678f 100644 --- a/hosts/mainz2 +++ b/hosts/mainz2 @@ -1,4 +1,6 @@ ------BEGIN RSA PUBLIC KEY----- +Address = spinat.freifunk-mwu.de +Port = 10655 +----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA4etejQVw/F3c5TlL8vHuO0dxdyPem+8yV6VUu++uexbGpwB6mMQV RDImqz9KM6AND5wSH2kcO9qmY+q5Tg7VmGvITYvVZWwaSihqKVcCj2lgQUUrn2IO /S9vaeiITp19BEfVMkXHSzlfi4sa7QhPFKe8jpua4qnWbXaOFV9DusLzLZUhAboQ From 32cc727d67394a737270f6484f9e440c028b1d8d Mon Sep 17 00:00:00 2001 From: knirps99 Date: Sat, 25 Oct 2014 19:09:30 +0200 Subject: [PATCH 029/132] Update mainz1 change ip to domain --- hosts/mainz1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/mainz1 b/hosts/mainz1 index 716cd3f..7eef353 100644 --- a/hosts/mainz1 +++ b/hosts/mainz1 @@ -1,4 +1,4 @@ -Address = 94.23.58.68 +Address = hinterschinken.freifunk-mwu.de Port = 10655 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAufGn5fV5dXxyQ75F1SARYxe3/7dDgcAsLp2IB8hXlQ6GGw/viYhF From eed1c1aeadc6432f2a0b98d308e3cd52385606f9 Mon Sep 17 00:00:00 2001 From: ka-ba Date: Sun, 26 Oct 2014 02:29:43 +0200 Subject: [PATCH 030/132] main1 will be wiesbaden2 from now on --- hosts/{mainz1 => wiesbaden2} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hosts/{mainz1 => wiesbaden2} (100%) diff --git a/hosts/mainz1 b/hosts/wiesbaden2 similarity index 100% rename from hosts/mainz1 rename to hosts/wiesbaden2 From a0300bc1706b2a78f8a37c6cf45b278ccc5ad394 Mon Sep 17 00:00:00 2001 From: ka-ba Date: Sun, 26 Oct 2014 02:38:31 +0200 Subject: [PATCH 031/132] change Wiesbaden addresses to FQDN instead IPs --- hosts/wiesbaden1 | 2 +- hosts/wiesbaden2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/wiesbaden1 b/hosts/wiesbaden1 index 2acb502..6da2cf6 100644 --- a/hosts/wiesbaden1 +++ b/hosts/wiesbaden1 @@ -1,4 +1,4 @@ -Address = 176.9.204.70 +Address = ic-wiesbaden1.freifunk-wiesbaden.de Port = 10655 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAwGbnNJm4sKnR51MP9hIBwFYfVbC8pVrlPyqk8wCn2GHKBYAEUW9u diff --git a/hosts/wiesbaden2 b/hosts/wiesbaden2 index 7eef353..a5224be 100644 --- a/hosts/wiesbaden2 +++ b/hosts/wiesbaden2 @@ -1,4 +1,4 @@ -Address = hinterschinken.freifunk-mwu.de +Address = ic-wiesbaden2.freifunk-wiesbaden.de Port = 10655 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAufGn5fV5dXxyQ75F1SARYxe3/7dDgcAsLp2IB8hXlQ6GGw/viYhF From c7e99c18304796e7e13f0b56d9b107d43639ed16 Mon Sep 17 00:00:00 2001 From: ka-ba Date: Sun, 26 Oct 2014 14:06:22 +0100 Subject: [PATCH 032/132] generic FQDN for mainz2 --- hosts/mainz2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/mainz2 b/hosts/mainz2 index f09678f..5dfa96a 100644 --- a/hosts/mainz2 +++ b/hosts/mainz2 @@ -1,4 +1,4 @@ -Address = spinat.freifunk-mwu.de +Address = ic-mainz2.freifunk-mainz.de Port = 10655 ----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA4etejQVw/F3c5TlL8vHuO0dxdyPem+8yV6VUu++uexbGpwB6mMQV From 9c39f3bd2e37b7b71823d578ca6cafed3de979d0 Mon Sep 17 00:00:00 2001 From: ka-ba Date: Sun, 26 Oct 2014 18:22:21 +0100 Subject: [PATCH 033/132] GRRRRR. key start marker for mainz2 got corrupted - fixed --- hosts/mainz2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/mainz2 b/hosts/mainz2 index 5dfa96a..ab589b5 100644 --- a/hosts/mainz2 +++ b/hosts/mainz2 @@ -1,6 +1,6 @@ Address = ic-mainz2.freifunk-mainz.de Port = 10655 -----BEGIN RSA PUBLIC KEY----- +-----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA4etejQVw/F3c5TlL8vHuO0dxdyPem+8yV6VUu++uexbGpwB6mMQV RDImqz9KM6AND5wSH2kcO9qmY+q5Tg7VmGvITYvVZWwaSihqKVcCj2lgQUUrn2IO /S9vaeiITp19BEfVMkXHSzlfi4sa7QhPFKe8jpua4qnWbXaOFV9DusLzLZUhAboQ From e8747217771eaf16048be30ad3b8daf7c1af7ee8 Mon Sep 17 00:00:00 2001 From: strehi Date: Sun, 26 Oct 2014 22:15:44 +0100 Subject: [PATCH 034/132] Karlsruhe1 for ffka added --- hosts/karlsruhe1 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/karlsruhe1 diff --git a/hosts/karlsruhe1 b/hosts/karlsruhe1 new file mode 100644 index 0000000..b957ae3 --- /dev/null +++ b/hosts/karlsruhe1 @@ -0,0 +1,15 @@ +Address = albufer0.ffka.net + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAnUWMpHTF+lbmBn3hs1awifxJdAKgAabrCAfTkIdq7uZ/UJj1mHx6 +/PUuofoh6yXwrOZmt1838X5VswFjuaEZq3y7SHhabC7Ry1p9c6PU7A1ZSewzZpLZ +cx45iFJUs0/UpZzEQysBlvC3hU5BEIhduJ/LQF06jZ6x8x1xmlGwloKf39cbbtL2 +Kcwzel24KMEzfw2HfbR6JfXxvQQj3MapNbiFaZlbyQNPEWJl4dDR9PuNG4p0yKyE +hYc3aUXdN4y1f5xCkXNcU5SLMBDkiO7qv7OAXiW1DGFo3lxl56sS90KHcmjPSawD +QURJOh3oubGQGLOdmBZuQx0Gx1vJDqF6faCCWo/XXGwZQ2y8KKhPeHX8jg/xqjBv +kUZ+jcOQ6AmiZWkILGKv3IpEp89QII7BJ7b3KpvNg1P3eTpSx4kEC5ZUkaA7b4hY +S3Mbhw5MqkH7AHALOLS+rsP2vJXON2SbxGpVIQN9j/eBA61oC6Of8IxZcM+g0r1M +W2ep/J/YWtwo9EpHztzS1gnf6MQ+ImFAfBlphbo3VLtLwHGISV2UZfhM5QM8h6GX ++Q+7uumFuSKvRJwGA3bYIosgz8m/EWrvxpxccodfjep2vbUBxDmvCvAwWVomzxQs +Os3CP0qdpymvPjgtwyxrMaCD8kJi3vfpD9NzCQB9YpL+PNBnguaQGS0CAwEAAQ== +-----END RSA PUBLIC KEY----- From ace50993542e945fe1b8f801e2d54a03ddd52ef6 Mon Sep 17 00:00:00 2001 From: paalsteek Date: Thu, 30 Oct 2014 23:31:05 +0100 Subject: [PATCH 035/132] Create westpfalz1 --- hosts/westpfalz1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/westpfalz1 diff --git a/hosts/westpfalz1 b/hosts/westpfalz1 new file mode 100644 index 0000000..aba1242 --- /dev/null +++ b/hosts/westpfalz1 @@ -0,0 +1,11 @@ +Address = gw01.freifunk-westpfalz.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1LnSTUhVzvecqhI6pvSPqTA7el2SPgi94gKa3FnDlMP9b6rCAVMg +hSHXyzKuYa0/LBX3/msDkeKojpUSMagqeXpMqvzSBP5h6BO/fJ43KQ/PBpIInLiF +hgTwJrxgi3hnVPzUOWYdcCSR1b7Y9WmD8E2ejfNPl4hwvER8oSto4iPAv1Zibv2h +peMUx184jdr47WUPdhAL41ZUaktoxTuQvtd2bAUdeDL7DypAm1txKJubbXGJHdpt +WLJKDb638TBfPyIwl45/m+ePhVHdoaYYC1oo1i0KHpznm1I06YHSMHarl9VAa21q +la/GGd00CsuW97S962angzScLaJ3fUUBcwIDAQAB +-----END RSA PUBLIC KEY----- From ce448f41c17baf9bb71087afa473303dbbf21fbd Mon Sep 17 00:00:00 2001 From: Kai 'wusel' Siering Date: Fri, 31 Oct 2014 17:54:03 +0100 Subject: [PATCH 036/132] Added gueterslohbgp1 & gueterslohbgp2 --- hosts/gueterslohbgp1 | 10 ++++++++++ hosts/gueterslohbgp2 | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 hosts/gueterslohbgp1 create mode 100644 hosts/gueterslohbgp2 diff --git a/hosts/gueterslohbgp1 b/hosts/gueterslohbgp1 new file mode 100644 index 0000000..4e20e21 --- /dev/null +++ b/hosts/gueterslohbgp1 @@ -0,0 +1,10 @@ +Address = bgp1.guetersloh.freifunk.net + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA9lK5No/IuY3o2NaIklnwYD/lHtHG4Qs6qjBGGrOmVJ1N2UsQRwVr +kbO5pi7sn6dX2xojn4u6WYDIXGdOEihlxdJ7SIgcfjlBSSkSlc73E4MAgG46tOSp +SdAKhllN2J614Mng2TWQ8SmQ0xMSR80FiJkwMnZ8pb4nUAr5kMiplzxZAxLrUyJG +0exDuKTPG6fKKIDKBXgO7gbUMbhGRpduo7BSS2VJ9SxtuVgI7Cs/d0O06f9L9Iq9 +krxzb42OHJk9pEQY8EB8jFQFiEdL7ShjXnJ+H5SeUyFX9bJZKyOYzAawwMWmkDK5 +Xm+6ZUW4XoMFWxJ79hLHu0oWxTcWWWGX8QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/gueterslohbgp2 b/hosts/gueterslohbgp2 new file mode 100644 index 0000000..5b1fae6 --- /dev/null +++ b/hosts/gueterslohbgp2 @@ -0,0 +1,10 @@ +Address = bgp2.guetersloh.freifunk.net + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAx3TChQ0jKU/VZOJAnAxFk8IGLowzvhmtAVZrli6JjXp2hyGS0hrC +ZS/aZzQhpqeEmAVgqUJSOicIVT2hwyieyZXEM+fPgfEmD04ZDVjSFpjEPdJCp5iC +rFU8saEg2c/MBnKAOl6YwjYUCADpjGpFrIvgGIv70OnFRzToQDAOZoW06Ka7OPnk +XBAtpzamQpfKjjER5OPkRvj9Ne8KcUHo1vkJO/X4BkuFSOA2HQHYXdLKfPxcBijv +XI+9imHtVCZzvU45XkUpOZ8GC8o4z2FszBjsh8skG2DoPckCe8Hz8S+Ajxl1xelG +5wQ3SZ8gEj5NnP+OY/3OjUkJwsG/CAyAYQIDAQAB +-----END RSA PUBLIC KEY----- From 4e8a3c207ecdd948ffb63eb3777b9576ebd9d03b Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Fri, 21 Nov 2014 00:37:19 +0100 Subject: [PATCH 037/132] Added bremen1 --- hosts/bremen1 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 hosts/bremen1 diff --git a/hosts/bremen1 b/hosts/bremen1 new file mode 100644 index 0000000..25b6df6 --- /dev/null +++ b/hosts/bremen1 @@ -0,0 +1,12 @@ +Address = vpn01.bremen.freifunk.net +Port = 656 + +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy2FfayKB0nuggl/B9Lff +lLAWf92KPDtmJt6un1nRylX99n1yTatnnzW9r4dv7oDKJVEGxOe9d17CIg0l/lQQ +UDC0sBJmB+JLQE8INHASQPcRbQVvlRrq+jVSUbpezA8H4W/FDc0kyERJG4zHAW4b +Om0c8ndFZBU2eMXTyaeFZ5gi6AETZ+GAOt3BGP3lhzVMIotnSf5Mm1q5EOejjlND +dsz3Fsn3ScWgVeUCjwWK1xs/jg5+pa90he/eqO+DmihxDA0006YBnQcA0kiprjK2 +k6Jo8J1KWD8G3m0XvWOu9z15WAKvkNSw96h28eGefsgQP+XEpEE9aWGcbuj88ycK +dwIDAQAB +-----END PUBLIC KEY----- From 88f4591e260961551bb1a65b93f8660f8850c441 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Fri, 21 Nov 2014 01:18:55 +0100 Subject: [PATCH 038/132] Updated key of bremen2 While generating the key for bremen1, I accidentially overwrote the key for bremen2. Four hours later, I must admit I can't recover it. Damn. --- hosts/bremen2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hosts/bremen2 b/hosts/bremen2 index 138504c..e17cefd 100644 --- a/hosts/bremen2 +++ b/hosts/bremen2 @@ -2,10 +2,10 @@ Address = vpn02.bremen.freifunk.net Port = 656 -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA3hpaoTvL0tI0Rnw9jpYGv+EfPjYzWuYf3xWy5DHBRN+8ualTk6tx -xzM+3Kjwlb9QtEkSVbGh6RRX7n0S6zwWc6TXYW9hnOTxzWdb+a7yAb80iXNl/8yC -MOOPphTKl15go7juW46/k4mEPxI/VStPmheAeMbU4YZDsspLta1QWr1Oo2pCON2B -pDCBE/PlZOnJ6L3JX4Wxt9LQsUsB8nWNmVFK0LC6NoN+fASz/qrnTwi7kb0PWIrS -8vEoS4J8NKjB5yT8GZyhZma5B48u7ABVNQoSA+9f27PZIq9a7h/mHuQUpaNGvbgP -I8pYwBqEmH5HUJGApprS9hpevdm3AUE0KQIDAQAB +MIIBCgKCAQEA5Wtnae3Qx2Dxf4PPPQuC+E0nOanMw4sbOlXjNBTNrNKAMVCH2MdZ ++cWZXIqyJ0aVYdjbH26tL/gjY/Uts9o52F6NpVCGrrgiua+qgLS0ZrlUllIjdqOW +yStc+1OnouhTE24KR81SMOsfmtyIt0IboCfB7TcJGbtjpQopzSks6Yv5fY/ybmm4 +3i9DSqYgJstBqMCZ2KNAajjMzCaQqljMR5BAYZsILo62MUa//oTZ4+M6XcODvctP +vPWfi5DWq9eFx2RiG03ePk2PWDFMazx3QXo5m/2d9iYVAqwJuwecayheGBmmAw3s +mBbTnmJ24P5o3JrkyefsQCmLpyajfab6zwIDAQAB -----END RSA PUBLIC KEY----- From 526cde98152fd969a517c8ed279248c4afc5e7a8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 21 Nov 2014 20:29:41 +0100 Subject: [PATCH 039/132] added berlin2 --- hosts/berlin2 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/berlin2 diff --git a/hosts/berlin2 b/hosts/berlin2 new file mode 100644 index 0000000..8d1f927 --- /dev/null +++ b/hosts/berlin2 @@ -0,0 +1,10 @@ +address = icvpn02.berlin.freifunk.net + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1+W5ZQo4iDlSZP+XEaEl89g4K8md9ob9i6SDg6YRGCZQG2dUjtZn +YOxi5fHhk0WUcHtUwTBPj6qQ7AlsLF3MOBbK7wI+rUQyMXd+CfEYC2xAhXFIjgfx +Takrqe55OppLyKcviAvlETYBdmOa67OCJTH8k3HfZ8RGAubPcxUyyyfvrNT6UTjC +CfSdli8aLHlQ/PrjBeV+Z8o4GpnI6FKDfOMVdvqFGta1tP4YVUmb+EGVlDeLRHZ9 +oWXFlwfbaYIvrgu/I6TuDaOABO11ZdjqObPnAOtHY+PMzdfXe2Bwp+6qzeUYKs2q +EIR/2m2ioMC/IXF2lBQH37JqN9V1s6PmiwIDAQAB +-----END RSA PUBLIC KEY----- From 49aec26132027255f96e9f1f1a81dcfe51c1717c Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Mon, 24 Nov 2014 12:54:59 +0100 Subject: [PATCH 040/132] Add hamburg02 we would be very happy if a lot of you also peer with this machine --- hosts/hamburg02 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/hamburg02 diff --git a/hosts/hamburg02 b/hosts/hamburg02 new file mode 100644 index 0000000..b52d8c1 --- /dev/null +++ b/hosts/hamburg02 @@ -0,0 +1,11 @@ +Address = 02.icvpn.hamburg.freifunk.net +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEApyg+KLP9XfIwOIgBHjbGgt0l5ve+/O1Mec3ed/d0q6Bh+oTkJxOn +ejtqYPXjBYkm50eCR0ib3xuc2HIB88v9BgW+wMjRtiUW0mPAWzpdbUa2sZPq98kG +xUytXz1+3xFBnVhMokAnBHaWO2LnV5Xy7XDpETd6ffrqA/eojm8IdDjPYraHBof1 +d5GNcrS2twaLh1ENMikpyAJqH6lr5vALXCDS/TPffv5GuOX53FLf3ZIzFM39fREo +1iBLeAHdVnYSN8ilsvH5No5wFbOvywctbRTqVQ5tM7ILTstsh044Q6OVfgYiSz6L +0D9xpd6OiWZZcsecPCN8yHl5fs7uoRV4uwIDAQAB +-----END RSA PUBLIC KEY----- From 6dac8e233a996520e5f9be0dc27258185ef11b86 Mon Sep 17 00:00:00 2001 From: Bjoern Franke Date: Tue, 25 Nov 2014 19:50:26 +0100 Subject: [PATCH 041/132] rename oldenburg1 to nordwest1 --- hosts/{oldenburg1 => nordwest1} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename hosts/{oldenburg1 => nordwest1} (86%) diff --git a/hosts/oldenburg1 b/hosts/nordwest1 similarity index 86% rename from hosts/oldenburg1 rename to hosts/nordwest1 index 7e362c2..00525fd 100644 --- a/hosts/oldenburg1 +++ b/hosts/nordwest1 @@ -1,4 +1,4 @@ -address = icvpn1.freifunk-ol.de +address = vpn01.nordwest.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAL0EZpLOsOimfcTybJByDdI39NjG7Hmu456sYpJTbNt1wFW8BqrtcWCx +lv6+kS0Vx1z3KBjPh5H4wSCP00SmNcFKMde5+2LAe6mQcAs/daRhccyw9T1f6uy From 042f0b6ef2a169e97ebd69ce884df05b37a2382c Mon Sep 17 00:00:00 2001 From: Bjoern Franke Date: Tue, 25 Nov 2014 19:53:49 +0100 Subject: [PATCH 042/132] add nordwest2 and nordwest3 --- hosts/nordwest2 | 10 ++++++++++ hosts/nordwest3 | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 hosts/nordwest2 create mode 100644 hosts/nordwest3 diff --git a/hosts/nordwest2 b/hosts/nordwest2 new file mode 100644 index 0000000..03d07ab --- /dev/null +++ b/hosts/nordwest2 @@ -0,0 +1,10 @@ +address = vpn02.nordwest.freifunk.net +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAuGBmUHbebSU+Yvic9mTbjkUdRrsJEL+oVhRESBFNu0Z1tXDph4Co +sCvYHuP2654RmZDqS8q6G7X6Grma19WJrqjmZsJ3jqpV8Ky76tihHv/SxolyFS5K +PN+fJkZ2W9lCOgO3gvMx1XTwNxGQQlOjbaqFX7JqjCY9gLIZo+RbWm3qp7tHyfnf +akU5PwcHlUoxHM6O8lvp1MJHmYB25swVeaIT0e5yFk0zO8RdotW4LrXXabAUz3Th +iVJHfxifJ+6tIcuX7JeFLSIiwV19ihV0IPN04QiAY2PiNlfingbpYnV7f8A7LZ/D +SPOniPi06Q9xry7foM/Y+uUvcw7iaV7fawIDAQAB +-----END RSA PUBLIC KEY----- + diff --git a/hosts/nordwest3 b/hosts/nordwest3 new file mode 100644 index 0000000..cbd2ee9 --- /dev/null +++ b/hosts/nordwest3 @@ -0,0 +1,10 @@ +address = vpn03.nordwest.freifunk.net +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1Xki3dIEeI/6rj9PoG/m6/M35Rtv510Xum5KtPrqHOcwaoFKXufR +BCd5hFYLuWZy9DHUkk67BIgjnPktdJCGvQKwVvFlh7/UNLw+ylyKRt7OoF3RpnOK +QilT90JeoMLLEmk9AXv6K+Q9hF0NGE/bGoJOJ5K4qTW2jffgHxcjFvOspd13zIxS +OPP/12CMrcpW3g4tYEgGhetSMiwKdtWktctxU1ILwjRH15/hQOM4zSVNnWXxTGJh +3+7QgCOpmbEb2VEqOuyNMoJnzFrSxwEiVjnVSvrvzXIBa8vapoUn2MJuazy5bsxk +NYWWhLtm3fTiRxcqWbIewimZvobYqYGrnQIDAQAB +-----END RSA PUBLIC KEY----- + From 9c45ef6fe32f58e877eaddc6c6d51115c1a6dde0 Mon Sep 17 00:00:00 2001 From: FreifunkUFO Date: Sun, 30 Nov 2014 16:55:22 +0100 Subject: [PATCH 043/132] Delete grossdraxdorf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Netz seit vielen Monaten zurückgebaut. Trotzdem jetzt am Wochenende in der taz erwähnt gewesen: http://www.taz.de/Freies-WLAN-fuer-alle/!150390/ --- hosts/grossdraxdorf | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 hosts/grossdraxdorf diff --git a/hosts/grossdraxdorf b/hosts/grossdraxdorf deleted file mode 100644 index f8073a5..0000000 --- a/hosts/grossdraxdorf +++ /dev/null @@ -1,7 +0,0 @@ -#Address = ffgdd.ath.cx -#Port = 655 ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAKhb22phgEM0fsbvIiqKRp4RgPd3N7mPAFtF0R55wyrw8QUyRJ/M0TKE -jJQKw8UVlmGNBcvjdLJQLowDhNn/3cob000ADVHaFrOlniwnlr4xw8FvARvdll8S -Q2l/uJXccBT2f5BwC9JxUPStdDWpb9r5YTAxVh/cA73yI1xNrurbAgMBAAE= ------END RSA PUBLIC KEY----- From d9c8fadd7a44cc80995d0b41719d6f3b27e5c77f Mon Sep 17 00:00:00 2001 From: xlizard Date: Mon, 1 Dec 2014 22:14:40 +0100 Subject: [PATCH 044/132] removed gronau1, migrated into nrw --- hosts/gronau1 | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 hosts/gronau1 diff --git a/hosts/gronau1 b/hosts/gronau1 deleted file mode 100644 index 6e4d1f9..0000000 --- a/hosts/gronau1 +++ /dev/null @@ -1,10 +0,0 @@ -Address=icvpn1.freifunk.liztv.net -Port=6655 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAxQUKeL0yOM7tMVRZCuTLbguK3A/KdVA2OdNXs+30n8iXuUhz//jB -jM/wWPXDmKrJSd0Vgb3REEQdE+DgbYI92gstDmks5ekrczgQFTHacVflE3XfJ4MT -CmGyBBxFV5KKGW4FNWGJuxIfArwCtATQ+3UBpLxT2gXFTxuqh8G7zYIT9WLxU5HV -sRMUPc6yBvUBm3gp+3c3Wqtau2YNFrkZ8KvxqFqbTjnloe8TKd06icwnGgdlWkaW -pyQivCotS+yIFKkAZFGbmso6EW2MGp3zlEtPE+8eWFx5OcnGz1MFmScgMEANHjbF -AMRCA6ewHbq7Qc6F9gQrixhpfU09LLtoVQIDAQAB ------END RSA PUBLIC KEY----- From b4ebb88d16b7e67c6d8b299c2234371b563ecb89 Mon Sep 17 00:00:00 2001 From: xlizard Date: Mon, 1 Dec 2014 22:14:58 +0100 Subject: [PATCH 045/132] removed gronau2, migrated into nrw --- hosts/gronau2 | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 hosts/gronau2 diff --git a/hosts/gronau2 b/hosts/gronau2 deleted file mode 100644 index 5cc0914..0000000 --- a/hosts/gronau2 +++ /dev/null @@ -1,16 +0,0 @@ -Address = icvpn2.freifunk.liztv.net -Port = 54419 ------BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEArU741UxzOdAmc75R5HT6XqhNVGw2WiuVGfhIlOVL35GBEwiCGf3T -eyKg9/hVOa4LmxEeFupXWUcopf0L62wuYInNTooIxfsQrh8VEtaIz2NtHmAaJmuq -luyZoup19+5LGlUI7rNlv8yyn909MRXIjGEmnwDH7w+0XPaj2XOSwHGy6Vf8znil -WFQK4lfhW6SVg2nwFEWd9txnLVtRFsts+7B0eJZqEqjHq0DHU8cvoBdbipxK2Qgs -5PMb1GgOy1kG2To9csVvERfCRlZQelnjcHdfl35KsjBgq2qpRGl/7W3fuBXUeOIj -Q4cpJCoyRNXrkYhG62u7xqumuGzDoMPub0i02cYzHxWcxj3XUzHwllRTYJNR4FHz -4DzhB+dhWOTXbEX0pF8vGclLalmAbjpy0PZ80k67B/x7a3wIm13uwrNJWZuAxVBk -CGh+o+GPmJDRLJgltSeXaD0cmcQAdfgqlNu/ziwxP8izmMxBgdabEpxDWC5qkrhY -94o7mEFpl0bILgamPtHgS3AL8ekO9qZs32UI1JiHl3VZAA4MFWCK1lwD3c8ULtU2 -z2DRRi8U5utZNi8iXsd7nKQd4aB5s8lIU3zkYBc57sumoWunpsVPNS1f8T9SK10a -JUGg/jz3UP+BH1QF0AGkqFGGDSejC/GODtQD6c0jFwWKI6y285dygt8CAwEAAQ== ------END RSA PUBLIC KEY----- - From 187927850ae90a3e70ee48411a41e0a495925fc7 Mon Sep 17 00:00:00 2001 From: xlizard Date: Mon, 1 Dec 2014 22:16:05 +0100 Subject: [PATCH 046/132] Create nrw3 --- hosts/nrw3 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 hosts/nrw3 diff --git a/hosts/nrw3 b/hosts/nrw3 new file mode 100644 index 0000000..e6f8583 --- /dev/null +++ b/hosts/nrw3 @@ -0,0 +1,16 @@ +Address=thor.freifunk-nrw.de +Address=148.251.117.6 +Address=2a01:4f8:202:63d3::2 +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEA5SfOg64T5gKpoGR9LZYbhEfkVNyHQsz+JCLoa/JTjVEPJylS9qEl +e3NXNmS+dyhVsvBpKwM3b7mn0TB24DEDH5s5WdU3jqnMVLD4YV51rt7XUphraRGH +k7h8/kzAVYZfXho2SplsE/x6YX5Vot1A6+sPRmqEgWsmk3will2bPRw1fd1jbVOX +E8k5zA3ChQmlCqR5O0ytwIpebcoOttAMU20O4gaZDOqbhCUy1FEqQTPS3XIQbp13 +VEUTkss0wfT8Ai6cF8cP9p1O7VmbQCUkUY+vjFlWnpu8msDtWIkQGDMXfFjb8IpW +99q6gPz6pDihNY31nCG2ugKJ59db4tp+j7TUiPH4HAlhTl4UZWAAXz8i+4EguI6l +oLUBKdgKcZklOv3DVxX+SpdnjODxXF2utyP825qjodRVO0mI36l4zmmzBvAqW+Xi +oky+j7IpKfzLEu1f5toTOqTrV7Xr59hB/yHTF9dymgbAaoWyMD+/a5hZurDrziWX +B/CcFkA7kOB8p0b6ELcel4L/iyjCCoTJIfHJUE7+cC5ZuJvlcBsHNv6rTBCHS0OR +g2aHlSlETkuEH7xcO2Pzc1nCHUdVLrCFSZu+EY9OsMN53MQtGfZ5UYtB1Pjz1uGS +BWFe9MRxwhw1yOvhj4lnPodPS8VDfT5ADcTkjkjbxxPR8ZYJ7jPSMU8CAwEAAQ== +-----END RSA PUBLIC KEY----- From 30418ba68c6267fa48f117d59b0893149c161755 Mon Sep 17 00:00:00 2001 From: kerel-fs Date: Sat, 6 Dec 2014 21:25:09 +0100 Subject: [PATCH 047/132] koeln1: Changed address and key. --- hosts/koeln1 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/hosts/koeln1 b/hosts/koeln1 index 1db427b..f6e0821 100644 --- a/hosts/koeln1 +++ b/hosts/koeln1 @@ -1,15 +1,11 @@ -Address = fastd4.kbu.freifunk.net +Address = fastd3.kbu.freifunk.net Port = 656 + -----BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAsxM/YeBqWIOp0Ld0wwrTLq38OjUSMfC3dsInjWa3+mfsRA1DW+RQ -Xru73jtUF0YpyEz04NmbDYGi2YweKVg5xwBiF3XfdZ8fYhYWSJfBa60o2dWfbUlg -1UZJHEnVbUDXWfzGIStiIlDEGjaFjt1Aem8n1R7yVYE5eMK1U3lVuPJswt+HvFE6 -ZEuj2MhstiZvg9uj3f1zXjF7sEZutLagt/JLSboARbtFe7rPhhTIUa/Kn+CEQePo -st2FM1T58e1yNoPgUUjnn5QI5bX0g+k8e2oIYGm6YptQ7/ROG4ElTvlj8V5nfZot -yzICsXfgoCcQ4/A4r7V4uMS3Gp/a8wOOcDoDOTQzMBBp8IEEbnwOkH5UbGIBp6WE -1pZ0Zku0jNuvNcALWUBHn4NaYVN6hm0LIVFB26TYclXrcD8Rompn8Xlbd6qsOEpx -n6ocnYrOwhhdv8c31fTf7urUTWgEdQUXN3jn6PRgCnDnAQy6M9+UCd0sMzf/3Nmb -opByBr0WAAJdtfGbA+cCiho2ptO+XgVQifTJ1GC7X7CspwjV2eb46tc7AiEgUqHj -ZopTzY7hWBxYTvR+GoCKLXJe4KFx4y53jgYbvgNiVNH9hjCnsyW7Bbh+asXNWoh8 -uq4wXfu2o6iO8rgAppy0qW9x4mJMZjZ+zjaHtUpvT8NI3jOQ3V/BbLsCAwEAAQ== +MIIBCgKCAQEAz3oaHpDvUgbQ51wZYpp8PntjxI4Tz+sTP8tWdp9/geh+alt+km6h +YeHGobGzUHj6usBOUC3YEjwsvgQLPgg3pykcxSK2ztzCFFc9triq1YVHueUFDF+N +VvxTDsN85tBiA/oYCV8nMQuyJ+V5U3xGUWfd74vYonpt4WeAT68HF5+h2gDtoNWR +A3jbn5fsEIFqxeL9KFSQSHGXfS6Sutzzt/TjW9lAq6/T9uV7brpH/Hi1oZBqRmM6 +na940t9kSTP/MSJMU06rtLxdG2gwvQotUO8K2H4KZBoNI5LmqH95GNszG+oeVDgk +cuKXcbVhi4FfGxw5z71Z2A777AZ2zrshKwIDAQAB -----END RSA PUBLIC KEY----- From cc19cc8cf909137473d67594ae0391ef8bd1bd84 Mon Sep 17 00:00:00 2001 From: kerel-fs Date: Sat, 6 Dec 2014 21:52:34 +0100 Subject: [PATCH 048/132] koeln1: Changed key size to 4096. --- hosts/koeln1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hosts/koeln1 b/hosts/koeln1 index f6e0821..55f9869 100644 --- a/hosts/koeln1 +++ b/hosts/koeln1 @@ -2,10 +2,10 @@ Address = fastd3.kbu.freifunk.net Port = 656 -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAz3oaHpDvUgbQ51wZYpp8PntjxI4Tz+sTP8tWdp9/geh+alt+km6h -YeHGobGzUHj6usBOUC3YEjwsvgQLPgg3pykcxSK2ztzCFFc9triq1YVHueUFDF+N -VvxTDsN85tBiA/oYCV8nMQuyJ+V5U3xGUWfd74vYonpt4WeAT68HF5+h2gDtoNWR -A3jbn5fsEIFqxeL9KFSQSHGXfS6Sutzzt/TjW9lAq6/T9uV7brpH/Hi1oZBqRmM6 -na940t9kSTP/MSJMU06rtLxdG2gwvQotUO8K2H4KZBoNI5LmqH95GNszG+oeVDgk -cuKXcbVhi4FfGxw5z71Z2A777AZ2zrshKwIDAQAB +MIIBCgKCAQEArNEVGqYdw6xbkHPEFkrWCJahwfRcx5nQ21VPc/tK4/uoTuQOW+DP +4WaPEvSqR/OrxkzW3UczWpTctPWfXOfjELPEYJXBZIQyyrcG6gXAc5yCv4I/IpZq +eBln4BcYT0dz44HnkyZTfSTM4+UYumaP+NMAVUGXhTYqvz1OLVOZMbV6OxQaZ0Xd +hRY+pvvbZV0FdanfkaMVf5LfEsM0IfPgeBU2rGPhb/tgYStcRS3PWbXpUlWx483w +yAknQLuR7eqOs/8EE9gfGuxike7jtKEPrUUm41Vged76kUbXfDNfS5rtCwb6g+dv +PMeG84DTBJ2kXwTnWzYkxtQQq+dbdRM3pwIDAQAB -----END RSA PUBLIC KEY----- From ea782ce326523e3c866e8175fca86fb439d76074 Mon Sep 17 00:00:00 2001 From: kerel-fs Date: Sat, 6 Dec 2014 22:07:56 +0100 Subject: [PATCH 049/132] koeln1: Changed key size properly to 4096. --- hosts/koeln1 | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/hosts/koeln1 b/hosts/koeln1 index 55f9869..2c6de0e 100644 --- a/hosts/koeln1 +++ b/hosts/koeln1 @@ -2,10 +2,15 @@ Address = fastd3.kbu.freifunk.net Port = 656 -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEArNEVGqYdw6xbkHPEFkrWCJahwfRcx5nQ21VPc/tK4/uoTuQOW+DP -4WaPEvSqR/OrxkzW3UczWpTctPWfXOfjELPEYJXBZIQyyrcG6gXAc5yCv4I/IpZq -eBln4BcYT0dz44HnkyZTfSTM4+UYumaP+NMAVUGXhTYqvz1OLVOZMbV6OxQaZ0Xd -hRY+pvvbZV0FdanfkaMVf5LfEsM0IfPgeBU2rGPhb/tgYStcRS3PWbXpUlWx483w -yAknQLuR7eqOs/8EE9gfGuxike7jtKEPrUUm41Vged76kUbXfDNfS5rtCwb6g+dv -PMeG84DTBJ2kXwTnWzYkxtQQq+dbdRM3pwIDAQAB +MIICCgKCAgEAwzH7Z0W0yIDp80G8sHpaxez7GXL3Lql7DAdJkrNf6KEzZAsZ7usn +9g6OoO5wQIWkBlEyGWGiCEIbGOHUQ7WjQwCkqO8Lfk6pJzheTjrRx7Sw/jd2aJwc +szZG/DN3T7Mt1BoYHqT+Q+SyoAgIggoCDYQMaRMwBJkb4c8MmHDEEW7tmJFip+NQ +5xv4BVGJBtWEkVhpVdLv6IQOB9jE1Jzpr8hlXDgNGqgKTAhK+dUtmpcwTRNyZok5 +0GZimewroF76FTy7bqiLJK2iotMw5SHbut3agaS7BTEggEkNeTzLq1p2YIf5lVr1 +ctTqkgiIALjiccnVhoWOwL9Rk+HB4O8s8qpK4cnLTHIkLWfLFLiuYkkENWMjiM68 +NVWbIkxMMujFKj3edNb/FD7vcdQ3kT5yoVwqTKP8UdboU4W+0LeLWCl3dOIF+gzz +57i8R4tugDUKms44L97Pt7ArjF8CRrFp43lV5LRxKTw6EeqU5BgMUyRXI2qF4d4W +EOQIMOX0v6P55zKeNKNm7iSNroqWeMA4wje0N4CsUir+GSQNFvmC3j0RypChcnmo +WHxCvnI1BMRv5m1PyxCibeiBlXSYqV66P8+XtSTWaAnnGH5scj/d3zO9fElqPepl +lQi16kmvex7I8S66jGh+MExIbEvvxJNyPaBQ4CN+kCujaj86dtz1W9cCAwEAAQ== -----END RSA PUBLIC KEY----- From 6ff6f5b2d1864d61715f76e8665d1ddef8ece7c5 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Sat, 20 Dec 2014 16:46:40 +0100 Subject: [PATCH 050/132] add hamburg03 --- hosts/hamburg03 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/hamburg03 diff --git a/hosts/hamburg03 b/hosts/hamburg03 new file mode 100644 index 0000000..854bc9d --- /dev/null +++ b/hosts/hamburg03 @@ -0,0 +1,11 @@ +Address = 03.icvpn.hamburg.freifunk.net +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEApitk4y7bZ8yI5U7pY87C8OdHMiYMQbMfd8KmttVhCFHaXgpbp6L5 +hWDT0+NhNrmSrCTYKilUKf452y192B5FM4HpL9ow3pDalybflLWZ5fDWt1AK8Wll +RpkGjPJLQFp+ZbJ05WLNtw5/OEsgYHF00bv6D6yhQ5wYrBVDzFvUF9a2wysFRfwa +//rGXoPkgOtZcFwHt8rG88xMRJbVhW9bOxTPAJiQ61z7t3t22DsNPNcBwlRKOaW6 +p0DPSGuit8fZrP6bPk4d3U4CthUofM7cbWtVAYltYDnvgnkwEUf2yTuOq+PFB4jC +xuSXtH3TdFjSVUBTSi4UjVZ84xfluFOZnQIDAQAB +-----END RSA PUBLIC KEY----- From dff4c086ef2882eeb3abb100acc6900b5e3bb9f4 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Sun, 21 Dec 2014 22:36:08 +0100 Subject: [PATCH 051/132] add hamburg 31c3 icvpn gateway --- hosts/hamburg31 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/hamburg31 diff --git a/hosts/hamburg31 b/hosts/hamburg31 new file mode 100644 index 0000000..2498972 --- /dev/null +++ b/hosts/hamburg31 @@ -0,0 +1,11 @@ +Address = 31c3.icvpn.hamburg.freifunk.net +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwxJL8dxTEgfM/oSOzZivDL2NxOtplh6yCusY+cbH5u+x1aRWhfbe +ZBv37xYGXQq1Gx+SX9zASsj50AX/XK634+NQWCHVVcBtcB8VDMA3d4WAnDtvvdwA +L/uZQzFuWzi60Y76LZZJXmvICxatHYO+1TUUdHyxnInLjVVFotKsmNRm5T4EwOoj +US414QvjO3Z8Hdmv8N/mA4RsMfJ7udrIbf7Rbne0w+Tfy7qgeYu1knNYcTObSHSe +JXf0byElmtlCXP/B+/gocvCFAXg87JVrVN8OxoZgF6GvH5GYOD/nz63uQ/SXc6P7 +qsIfCa/XW2J5Jgt7DIfjQImjII55udo7DwIDAQAB +-----END RSA PUBLIC KEY----- From 4160479b3fbbb4970d229fbfe5c012ae43e54fc2 Mon Sep 17 00:00:00 2001 From: Freifunk Ehingen Date: Wed, 24 Dec 2014 12:36:53 +0100 Subject: [PATCH 052/132] Added first gateway of Freifunk Ehingen --- hosts/ehingen1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/ehingen1 diff --git a/hosts/ehingen1 b/hosts/ehingen1 new file mode 100644 index 0000000..3c7d3ae --- /dev/null +++ b/hosts/ehingen1 @@ -0,0 +1,11 @@ +Address = gw01.freifunk-ehingen.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAz1zcs2ZgiZRLVXQyqYXKD3+dx7imqN/cmJ6CYoSfxjesslWaS+qG +29YH+U7qXSDgRyjVtdXdVHIa9dYSKff292H7yzX3LbHPsUEeq5kAAqqieTIsRYoI +6QeUTYkfSuvkqmAe1zUmC5fcf8BRSu2YUHSWhM5Lu9ulWzXuKYoipnXgqQzVz67w +3DnYEx/DEAxn4LKagOpUq+l9OzChOtMWeW1/MSCaEhm7VLYaY9YITdhb5U61PB7F +fdv/77AhRBjL6zfNX6M9ZookKukAz3KHme5EzDYXVA4CiyBN+HMzgCYHbqopOiVZ +BGjNAeO8FjAkBwn5Os608LOSocOEVz9KDwIDAQAB +-----END RSA PUBLIC KEY----- From 6624a1d4dc418e78f159c4d2cf215ce7a39e1b53 Mon Sep 17 00:00:00 2001 From: Maximilian Wilhelm Date: Sat, 27 Dec 2014 21:36:37 +0100 Subject: [PATCH 053/132] Add first gateways of Freifunk Paderborn. Signed-off-by: Maximilian Wilhelm --- hosts/paderborn01 | 11 +++++++++++ hosts/paderborn02 | 12 ++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 hosts/paderborn01 create mode 100644 hosts/paderborn02 diff --git a/hosts/paderborn01 b/hosts/paderborn01 new file mode 100644 index 0000000..eee33ed --- /dev/null +++ b/hosts/paderborn01 @@ -0,0 +1,11 @@ +Address = icvpn01.paderborn.freifunk.net +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA4cvTv6la/nx3rlmViAXR4xsFsxoqhB9NkfDWXkG/Nl+oZeSf2wOp +U1nTcKKiykkqNcnTcyQMiztAtCPd+bymrWN0M5p2JMc9EueZZOtb4+OZlrIrI77W ++8BSYoH6tX5DnZXEy3DfC2hqKZmHi/7mOwBz4wNYA0dLcUbXolrsSJMlORPYh20J +YIn2ulwWa8CPwmg7Xd2CsuCc6hjcVGP/4y1hz0I5gOaZaRw3xMPqkRANr4/wdjqP +ua4ZITJ358XZ3yDVEKljpn7CoEpcJo5e5PUoFdzkRF+V9JOQuQ1hA2Lunhr5hKw4 +Ykdlr+Tw/R1LKRnT2FCpEdzcT4+64tHNYQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/paderborn02 b/hosts/paderborn02 new file mode 100644 index 0000000..806ac52 --- /dev/null +++ b/hosts/paderborn02 @@ -0,0 +1,12 @@ +Address = icvpn02.paderborn.freifunk.net +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvZ5t6KIpOOJ0ZUW570Bgc+LpiN4cqeaTuEPXIbKsL+XA02igUb5M +JfQIgy0xRpNX20ACvxq/omL9sJRs5HRvbnn3nSEIIE0fj4t0kw1Wx79Os028nlDD +nz+Q3Tr1AvOriOTTuhVR1fI7ooHgkI61oQZTlzDAd77ALzHhJyGTcNUWifBYB4pv +5GAaHHWraNTXj1BrM8GHdby/RjsHfnYk38MGYE0N8KKi8UENkAuIFWLP8Bj8PPMA +ebiLYLDpPquRi+cYP1ahH8zrLgx+dXIrDO4h4cSJiewAe1dQh415ma37kV7RMAVT +RO9NTALPJ/wstNYZdjlTt82N5MTrzgzN4wIDAQAB +-----END RSA PUBLIC KEY----- + From 207186fa1b912621d5fe4c0f8c10a6df6e4e5eba Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Sun, 28 Dec 2014 02:35:42 +0100 Subject: [PATCH 054/132] hamburg: remove 05 and 01 --- hosts/hamburg01 | 11 ----------- hosts/hamburg05 | 11 ----------- 2 files changed, 22 deletions(-) delete mode 100644 hosts/hamburg01 delete mode 100644 hosts/hamburg05 diff --git a/hosts/hamburg01 b/hosts/hamburg01 deleted file mode 100644 index 9ab424c..0000000 --- a/hosts/hamburg01 +++ /dev/null @@ -1,11 +0,0 @@ -Address = gw01.hamburg.freifunk.net -Port = 656 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAxVFG8vqjOM+2M2hQiY1MFJi8Tj0sKSEWrZ/a09Hf5lQUwIDl3ZVj -2uA1/1zjQPlN5GR5X/N/P1pErcQkBUQvduvyiWATH5aoi2WlNlNZlMiXs1zni0fF -j0WDQ+RS0Q/8EzdW1jUyXQtidS7Hq3B+w66OZ/3gK5TuDbUdmzcdG8rr96mhgwGN -7Wa5kqk4Ye96V67hUgrA+JZEGzddwomb+R6lppGFVG18i/JCco2rqMnKw9a53exa -YG9zkT8DguwxXxpjslBLSYAN4AkQXQYYUU7N/nBxEK1kQGYcibTq85iFdxGgz8de -S8hsqtRiASZqzCjZAs0ShDlb2KhBWuvevQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/hamburg05 b/hosts/hamburg05 deleted file mode 100644 index d275280..0000000 --- a/hosts/hamburg05 +++ /dev/null @@ -1,11 +0,0 @@ -Address = gw05.hamburg.freifunk.net -Port = 656 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAviyczF+Agoa8GZKHNfc0PuiphDpwArZ58HKHPUN8Kg9WGb0RG77G -mzqSTbr7qNusmrXByETvi4ftLPVO9bfvTkAXatPZwhQoo0mAUyyJJhkMaAjH5HRx -UoJ9y1ulu9kn1Q7PBPUV3/HTpRknTBptoU/0XO+3t3pYI6ZhvxyoWhCGCw9TEQ+a -HHDFzKs45abKPZKPVOMoDqoVURe/atgwzy865AkKrCaiJLSGC3tjVQPUZbLJSl6L -bPd4j/lCn5KNjFlZsepme/1TMtotRaA2ICd6jmrVR5n2Jcf4zhZndDJYiUR6EPde -N0sEf70x7Dv4uHMWrczghU07DJiRL5ewcwIDAQAB ------END RSA PUBLIC KEY----- From 881761be5bba44b79563a63b1539ba3809ce540a Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sun, 28 Dec 2014 20:45:52 +0100 Subject: [PATCH 055/132] scripts/post-merge: fix documentation --- scripts/post-merge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/post-merge b/scripts/post-merge index dc97dd3..f45b79f 100755 --- a/scripts/post-merge +++ b/scripts/post-merge @@ -3,7 +3,7 @@ # post-merge hook for Debian systems # # 1. copy to .git/hooks -# 2. to test run "git pull -q" +# 2. to test run ".git/hooks/post-merge" # 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/" # From 9e81a9d07ea9331b295f4a0df983588527024d74 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 28 Dec 2014 20:57:17 +0100 Subject: [PATCH 056/132] Add pub key goettingen1 --- hosts/goettingen1 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/goettingen1 diff --git a/hosts/goettingen1 b/hosts/goettingen1 new file mode 100644 index 0000000..733d0d8 --- /dev/null +++ b/hosts/goettingen1 @@ -0,0 +1,10 @@ +Address = vpn1.cccgoe.de + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAqQXK6Uk1ywBmEcaTz+ncrZNRnX9Lg1QlmTqKHl6ZqW2Bro/CvmES +YfeRWbBVeN5w5DwMZMP7PaQvd+LOgAKiubpsn3O2XssnjuLz51p+JQ8KO127i19L +PDokpdM1AvEdHo96lDKqpSE5MVFQZeiajg6AtPtI5IR2rjsO23U9dmAEuVzCn7r9 +34+5fFyrRK+NvAbb0qVA5yUnRwEKbeYA9VAGfmm99LriL6KDyApjEqNWJt0YNOzP +CfSoH9tDQDIH8S8CMgVkyPtqEptQGaWBjVGiO1oKB3B7SF2MjHV6Idja80zDVEeZ +ah0MbeQWps9x/mkyWrcIPnC+2MPimQF5awIDAQAB +-----END RSA PUBLIC KEY----- From a5adeb69003322ed4235e1f785a22cba36d9dbe9 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld Date: Sun, 28 Dec 2014 21:02:49 +0100 Subject: [PATCH 057/132] host muenster1 eingetragen --- hosts/muenster1 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/muenster1 diff --git a/hosts/muenster1 b/hosts/muenster1 new file mode 100644 index 0000000..f827c19 --- /dev/null +++ b/hosts/muenster1 @@ -0,0 +1,10 @@ +Address = 78.46.190.61 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA04VN8hn5Bm4jEFLEexRP6XOq28OWnH/9k6n/0NMgFXPDRPabU+LF +70mgOYJ4iLcux8MPJg2snWbpN9XAGBPIlH4B0D+sIGdIZstsFd9Qi7zeAIPie4n9 +e/qTQFC7xOfDbQL+Rhz7Xd5T3tTXn3O0WjiMb5fQC+hqOJC+7aQY0S+8Eav/6l/v +EdmxSFoJOFs2NHz1GhqVy1S0LeZ5P6VE4s/Lg6oTi4aY1pKpAEzYGdPdVlIfdW2g +OeBYayzhLwiEUuM1YAEJPbRgoaT8SFDAzD0smwcb3c3O985wdDWklCeYOoM2iNqd +tGGuWEuSOCp89ltLRswD6zQZteAA9vMBvQIDAQAB +-----END RSA PUBLIC KEY----- From a0ceb94cfef8a82ac20dd47f1e1e2e703a22a6de Mon Sep 17 00:00:00 2001 From: Mic Date: Sun, 28 Dec 2014 21:17:19 +0100 Subject: [PATCH 058/132] removed Rheinland, added Rheinufer1 --- hosts/rheinland0 | 8 -------- hosts/rheinland1 | 8 -------- hosts/rheinland2 | 9 --------- hosts/rheinufer1 | 8 ++++++++ 4 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 hosts/rheinland0 delete mode 100644 hosts/rheinland1 delete mode 100644 hosts/rheinland2 create mode 100644 hosts/rheinufer1 diff --git a/hosts/rheinland0 b/hosts/rheinland0 deleted file mode 100644 index cc159ea..0000000 --- a/hosts/rheinland0 +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA0TDDa3uBpJq8myoeDKV4yky6fZOdU6H4UT4Ex/pdMvkv8zxfgNuk -vAcjrKfas9y+TFahj3E/dyKJto0M26Sv8cUYI3E5plXkZ/MJFSIA4WIe0Xs5uaaI -1D68B3QuYvvxHE9oWMLnfpxD925t69gGRrMxAZ4Uj0U89pewwh9Qxgd53bj4YTTO -aU8qWswIsK4WKEUT2Kz/yYt743eYKJnQBoJgPpO+cdOyIWfdP4BjWJe+OZimsK0D -qel96RXJsjty0F30Fz5IgbIFbsJ/S6DUiGtcanIhkGbCSq/ldcuU4XodBXmPbYpA -5l9I2/KcOJmBJLSDpTjf11UYVYnFrBozJwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/rheinland1 b/hosts/rheinland1 deleted file mode 100644 index eb81bf8..0000000 --- a/hosts/rheinland1 +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAwK1wirB20JHRPeBrXzJkgfT48Bssr7EPTJ3A6qLl2lDB9xJP9aG4 -0VlYy4LDEgl5QAILcLVvx2TiyDLCRhF5Fqeeisf3bIDRuvFJFZEbyEkpVQh/R08y -A1K20JNrOrsc2Lz3IMwORXrVylYwZNK4xySvByF3gA1Z64mViQMlXc/symn8eC8Z -Z0rCJPWMSKBWkGa3h3I8fcCv9Mdb+otQD/0BaGtNIrSqZ8/PeovuMmN95gUaXqUa -DqSgrwy02o1TwdVWxWb89XxvjNLRIHwM2T4pa6rncYeXMwx2mtVleE0BC/UM/kes -cpp6eeIwxTaHVji7maKLvBj1PaNmfS56lwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/rheinland2 b/hosts/rheinland2 deleted file mode 100644 index 57ebb0b..0000000 --- a/hosts/rheinland2 +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAuEw4ZlMsaSJVlNvgAdX42Sfrg9D+Kqm0UMNl1q0a6gTi2HpTvTbK -eIYQcIcZG2JteGY/lg3oc+MrreHz17SXw4nxT7YABNH8qvPrUYxpKWFv/DoviFvW -sNA3glksMHoJlWsO8x+90zDWTGJa03vfWtOLXr+srg8otlbcXqCWFHe9FCMxpZso -ffc2mejRLXw3irFx5udovVd3HJQn/pS37P/l1inCxTnjZWi5ywuMv61a3gKKaETk -jOfznx36Dmpdi5RABl3Yy56Vgcv1xGYvZVEwC8VG6mMRBIg8TwhCUW3etHJz6W3L -NHBDvfM4ZwNpItA+TdPUZiYHD5lE4w66lQIDAQAB ------END RSA PUBLIC KEY----- - diff --git a/hosts/rheinufer1 b/hosts/rheinufer1 new file mode 100644 index 0000000..6a9b67d --- /dev/null +++ b/hosts/rheinufer1 @@ -0,0 +1,8 @@ +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA5MIt2T0V8Non2Tpv9MmA8I6ekEaKl/sKZIz2LMzYe7n1wOh6ncHu +INd5PklfgEFEPwRYxvrVs/kFWwFZJJqSr5i8eDfUMH0qFkJIrync9y9EhhTdiwdw ++dQZooNYByIxxEAZDiev1ptunCdC1uIe5VIqHBDFI6tieYKtSd+5eTBIk0kehBqy +Pn9+8gTFqqrqkhPMBgZugtX09MItL98fTTque4snF8GGsAI9AcQ+Cx2hSd1HCVM/ +22RVSz8nO2aIxl+AqiBpWAI2JnB6uzq/OyvV6GwMAetXNyzenE4OCnZmqymSGrnR +wVFVCrIUGqLFLxerHnzosrzQ+JI5YjzTWwIDAQAB +-----END RSA PUBLIC KEY----- From 23a42b87b833fb65b98dfbdc23c8a6a8c6fcb58b Mon Sep 17 00:00:00 2001 From: Mic Date: Sun, 28 Dec 2014 21:22:36 +0100 Subject: [PATCH 059/132] added ip address and port for Rheinufer --- hosts/rheinufer1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/rheinufer1 b/hosts/rheinufer1 index 6a9b67d..223b531 100644 --- a/hosts/rheinufer1 +++ b/hosts/rheinufer1 @@ -1,3 +1,5 @@ +Address = rheinufer1.freifunk-rheinland.net +Port = 656 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA5MIt2T0V8Non2Tpv9MmA8I6ekEaKl/sKZIz2LMzYe7n1wOh6ncHu INd5PklfgEFEPwRYxvrVs/kFWwFZJJqSr5i8eDfUMH0qFkJIrync9y9EhhTdiwdw From 856e729581731e7cb67f80e75dc60af4932aa787 Mon Sep 17 00:00:00 2001 From: FreifunkUFO Date: Sun, 28 Dec 2014 22:02:06 +0100 Subject: [PATCH 060/132] freifunk gadow --- hosts/gadow | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/gadow diff --git a/hosts/gadow b/hosts/gadow new file mode 100644 index 0000000..c9b26a8 --- /dev/null +++ b/hosts/gadow @@ -0,0 +1,10 @@ +Address = freifunk-gadow.de + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAu4C4/nHeAvAUhUQeraE4Mpjl3WV6fFUpYCp0sNXYqlp36rZZiNnG +tpwpOiAbAAx1yutT5UvJIc9/w9WctQNvnXfpvzpSwmT/7+4QA6e0gxFjvTbP5ymk +Kptmi43KdLppCSMFGyH9rb1yVha9vWS0INBZbzAnZK39txTMntSp9YD7ek2fZr6o +R+Np261OAd+fEhuG0BEoGXvJscrCK8QWSTlz+xIxJV+B0d/nXGshTiXqsziwDQRc +aG7tG6jAPsqXxU7h7/QdHi3fbncUKWRsBxX6holHEqNfks3gIUeLPelbuO7lP16j +qRE7i2WH0bOD8oSUtAvuPE4A2PmoY++jvwIDAQAB +-----END RSA PUBLIC KEY----- From f15810b52a0848a6793408e2d745dd16254dd576 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Fri, 2 Jan 2015 13:01:37 +0100 Subject: [PATCH 061/132] remove hamburg 31C3 gateway thank you for a nice congress and a nice freifunk assembly --- hosts/hamburg31 | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 hosts/hamburg31 diff --git a/hosts/hamburg31 b/hosts/hamburg31 deleted file mode 100644 index 2498972..0000000 --- a/hosts/hamburg31 +++ /dev/null @@ -1,11 +0,0 @@ -Address = 31c3.icvpn.hamburg.freifunk.net -Port = 656 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAwxJL8dxTEgfM/oSOzZivDL2NxOtplh6yCusY+cbH5u+x1aRWhfbe -ZBv37xYGXQq1Gx+SX9zASsj50AX/XK634+NQWCHVVcBtcB8VDMA3d4WAnDtvvdwA -L/uZQzFuWzi60Y76LZZJXmvICxatHYO+1TUUdHyxnInLjVVFotKsmNRm5T4EwOoj -US414QvjO3Z8Hdmv8N/mA4RsMfJ7udrIbf7Rbne0w+Tfy7qgeYu1knNYcTObSHSe -JXf0byElmtlCXP/B+/gocvCFAXg87JVrVN8OxoZgF6GvH5GYOD/nz63uQ/SXc6P7 -qsIfCa/XW2J5Jgt7DIfjQImjII55udo7DwIDAQAB ------END RSA PUBLIC KEY----- From e7766f20a1bfd75c8935c30f0806b2389f511c68 Mon Sep 17 00:00:00 2001 From: hhansen06 Date: Sun, 11 Jan 2015 23:52:50 +0100 Subject: [PATCH 062/132] added Community FFDH --- hosts/diepholz1 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/diepholz1 diff --git a/hosts/diepholz1 b/hosts/diepholz1 new file mode 100644 index 0000000..10547c2 --- /dev/null +++ b/hosts/diepholz1 @@ -0,0 +1,10 @@ +Address = gw1.freifunk-dh.de +Port = 655 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA3SOeCXMYhCyoBXd4LhJDEdq8afDcdT2+kX+8Cnv5HHMWfKv0PodZ +1zwPl04D3e7MJ+F73YXOIV6zAdEpwXMW6h15qg3r5vL+ZPKY/ywYnb3c1CIOe2C8 +2rJoo9ynjJJt3rbrSc2qOkKFcEfSZWPn2cs9IiaX/tgZaPwpc/KDjPQ5kQ9AwVJk +2jMhuBHQClPUw/szHwkultrkRehQ7+H/lq7VMXdxfBHBh6Vtk6KX6N8S7NXYcKbG +Gk52yzLnlmGLxqJbPBBg68o54EEPsS9HUe4oKRkhYoHduQu3OTL4oFZTTXqVmaxB +JSXyXDFbJPMPNoSsC2F2D9bfPswIfH/efQIDAQAB +-----END RSA PUBLIC KEY----- \ No newline at end of file From 3e10988aa6bcde320680664975a34d9855fc0b48 Mon Sep 17 00:00:00 2001 From: Kai 'wusel' Siering Date: Tue, 13 Jan 2015 20:00:28 +0100 Subject: [PATCH 063/132] Adding Mueritz1 --- hosts/mueritz_bgp1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/mueritz_bgp1 diff --git a/hosts/mueritz_bgp1 b/hosts/mueritz_bgp1 new file mode 100644 index 0000000..dd8b597 --- /dev/null +++ b/hosts/mueritz_bgp1 @@ -0,0 +1,11 @@ +Address = gw05.4830.org +Port = 655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAuizkPDLiPvMxnom5i6RG0ijqT9tKmuAFWdMT8FIPoP+d4x0M+1WF +F8tPZk6Si1t7AX9Cp4ZhPHbbwvSXb/P4Q2VLX2w0A9F67bZQFUBKCaGdRuFPXd2/ +aPr2mQQFB0agA5rkQgegRVbFhKhxGE3UMLhP2DYkfTSI7Yw0oyzGOnSK1Jga5Y9Z +8W/sxPxj0rpAt/NFfl88qI9aiOYmOD8aFu+spQnNi9/K2yXVdYul0w7w2KAnCyjq +QWZbNzxFT6Lnlr4YnpuN3Yd81eeThPbH9of2wdMKyJSL6cYM+zZxCeniscspWrRw +3LPyinT/hEHLChkrQY507QQWXCM588yZeQIDAQAB +-----END RSA PUBLIC KEY----- From e7f03c384c8f62d2bc471cb867bc8a7926dcb205 Mon Sep 17 00:00:00 2001 From: Kai 'wusel' Siering Date: Mon, 26 Jan 2015 01:32:35 +0100 Subject: [PATCH 064/132] New key --- hosts/gueterslohbgp2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hosts/gueterslohbgp2 b/hosts/gueterslohbgp2 index 5b1fae6..a508444 100644 --- a/hosts/gueterslohbgp2 +++ b/hosts/gueterslohbgp2 @@ -1,10 +1,10 @@ Address = bgp2.guetersloh.freifunk.net -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAx3TChQ0jKU/VZOJAnAxFk8IGLowzvhmtAVZrli6JjXp2hyGS0hrC -ZS/aZzQhpqeEmAVgqUJSOicIVT2hwyieyZXEM+fPgfEmD04ZDVjSFpjEPdJCp5iC -rFU8saEg2c/MBnKAOl6YwjYUCADpjGpFrIvgGIv70OnFRzToQDAOZoW06Ka7OPnk -XBAtpzamQpfKjjER5OPkRvj9Ne8KcUHo1vkJO/X4BkuFSOA2HQHYXdLKfPxcBijv -XI+9imHtVCZzvU45XkUpOZ8GC8o4z2FszBjsh8skG2DoPckCe8Hz8S+Ajxl1xelG -5wQ3SZ8gEj5NnP+OY/3OjUkJwsG/CAyAYQIDAQAB +MIIBCgKCAQEAwNqFwx5UvkekzqCArb2BBFBqtdRbOsY5WlL58qXPVm6buVqZhy0R +ZZ497YrX82L3K97sFZ/1jFa/YsY9n6E912Zcca5GxY7ln/wrkO8mSfvCq1KCUpv9 +/00cQxTf+AVlHvryWDupxPasO29wb6b5ftd3HXR1lG/eg3YXmXMAFnWr7wYnrFwW +1YP9YW1cJRZw9AjQ7Y1X2ETa4JkcjCjY7R7hVoJFoVqjf5JLBpqGy/swETrQB0Ln +ZpSRSrmfMhf1dIIYnYLoqH9og6ypl6vAqYAOwN9KIFTODK7uXW9ARVyor9I9R4cC +cMtg3bB/QyS+GJDyvYCGJn/ZL6TrSOw7WwIDAQAB -----END RSA PUBLIC KEY----- From 4c453a1b945b5433ce1af4d0442f4357731fa4ff Mon Sep 17 00:00:00 2001 From: strehi Date: Mon, 26 Jan 2015 13:33:28 +0100 Subject: [PATCH 065/132] Karlsruhe2 added --- hosts/karlsruhe2 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/karlsruhe2 diff --git a/hosts/karlsruhe2 b/hosts/karlsruhe2 new file mode 100644 index 0000000..59500a6 --- /dev/null +++ b/hosts/karlsruhe2 @@ -0,0 +1,15 @@ +Address = albufer1.ffka.net + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAv3w8au8y75sWMzfi1sRzOjI/f+7Gak0qqHcGAQGd+TCwF88OgGDk +c7TUQJfUG1FcLSiEMKUSKyokFBU6qbzrnwxsK+/foEGrcde4CKaJ1/q+wxL1lRu0 +/12ZVIvr6rMHugjD7XfRbHaUoH1p6ki1+mpwRiLKgKimYxaKoTTJGzkR5Gkabu59 +J7zq6NhzDl+n4usI16Hd2rCtdvG5txDQJvnQTXS4oaidYMDbOulAK+FmDSwkPIcU +uaGELGD1eMDKR6e/cp3DqTLG54GgmxamL1i44iGwOWfFGC+JfeNEcS/FgOzIhTrR +a8SRnwJ7FnfqaOee0Ktht1iRmuhJQxtrgusi++WII77SC9jH1kZw2bqh60YbQVlh +szNPfbpu/TRiqlduDJDmmJgXDG0J3eSvzLWT1D+qXG5Swk7R04VYLCh/oXHAiHol +l/3D7423tcW51hq316if/9ncfXpKXcdQiEIjmhVt1vi7FQk+1lwmTOKXBAAXnZDb +7zO2aY1p7YncAudL1CP3oQPazWQHW+2XmLvnOL5guBb/3LL/3CltwBUAz6zfm2Pj +YKNiQJG5+YBZaPAIy+y4mhDbh9TIO3Zw0eNt4jinu7486iWstkjj+V8E7fWkTBZd +t2kGBpR5xOVsd8ettZr5pDni9n/e/SJasizsqGjsQnPjWqEUj+wZKn8CAwEAAQ== +-----END RSA PUBLIC KEY----- From 61743d7acddd0cafdd65d9c6e787ec45c7d58f38 Mon Sep 17 00:00:00 2001 From: thomasDOTde Date: Sun, 1 Feb 2015 02:06:50 +0100 Subject: [PATCH 066/132] added 103.freifunk-moehne.de --- hosts/moehne103 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/moehne103 diff --git a/hosts/moehne103 b/hosts/moehne103 new file mode 100644 index 0000000..a07102e --- /dev/null +++ b/hosts/moehne103 @@ -0,0 +1,15 @@ +address = 103.freifunk-moehne.de +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAzBMf2LQ7pa12n6VwBMUhMlJ0OXq6QYpPjfJpzJM4mnZ5j4oecpuN +Y1WO3FcbMuvU87eVNUUe+qetK1EuneqFadw4vILI5RNFYoWolqHqEDZmO2rLe9QK +T/CGYcLUi0SAOlXhXtPOod6XY+wcYJC8bq/tZDp/kWUbrwPJ+pl/bIAjex8WddaV +REJEayNvbgy5ehQ9+2JYHm1RSPfsz5UXD6hcgcKbQyqZZfvuL/r1WWQ+7gednVR9 +ZQwgenLCVBZRDs5K7rH0oyv3VrY3SYJijoBTuTLcLiso9s7jJn9gsbv3DtyqkRXD +nhxGGFAfpMk1i4lcf40l9xkoCjiajRvcpCHuXUddl1TNVUXUd6KcciRHLLlqM/hr +Od0QzuW3PGvWHqTPinSvtkwIh+7t2LUlDsH1QfB2FOHppYbjci3YpwnLWJUlzuAh +mAJRM+jBiofKlWnJiU3nnncs58+bGgqhBO8b7F2pjoT5j9qqvOzgZnYAN+g+kvWJ +Abq0eWodCcvLmcbiycVP2HzI/A4lhRGjjvfFLRmLO7R6ZO5iXuBoM6W4AKwoxJrw +SBpf04nphfWBsez1QW6YqxxsTEDI1+y43VQmu1DVxhrQwexldRaMNLpyNVDZzZCv +hmPpPDJLfdAlr3ld78aBZHVAB5mCOygPuNHbtxnTc3xMWW+zDVeBQvcCAwEAAQ== +-----END RSA PUBLIC KEY----- + From 6a65b62e379107d78a36d414b530a95df5db5e82 Mon Sep 17 00:00:00 2001 From: thomasDOTde Date: Tue, 3 Feb 2015 12:18:59 +0100 Subject: [PATCH 067/132] added 003.freifunk-moehne.de --- hosts/moehne003 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/moehne003 diff --git a/hosts/moehne003 b/hosts/moehne003 new file mode 100644 index 0000000..da668eb --- /dev/null +++ b/hosts/moehne003 @@ -0,0 +1,15 @@ +address = 003.freifunk-moehne.de +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAt9L7wOZhCIIoRZSFE+AiQ6evhH+I7z2duDULC3COb8EorKZzaFse +cTCfaOdZ6+cbraqFOiwAzigSf6CoaE8XdnSsWcowQGfESL+CJopoC3Be8h3Cz7ct +mWz+XmuRl6hHOKqGKxWRxihHQs5zdhF3k/iloWbBqozgKfqqaD8qkeKF32Fn14Ze +UUm7hWQgicyemGGZhBE3dluV9svN/XmAFty2r05y03wnHB37jc9RdegW3TcNSO4m +Y9K/q7pXQiA9TwoSpOEv+tKzWoVPf6Rp2ZXZb64vgl+tBnjvT8URL+EiYDHz0LTa +EuhHuK8pulXOQ5rZ1WmzuQDHBZWVMOLsiAepNd/zMXVpbp5CHpMW0zAbCDwtSdIv +qKODY28jWPvIxKK+7RyVaIehGrtu38zkelLYBaGuDUI6WLPkF8nM1BuJj69e47cF +NccaZah1wDIHk7WCCSUs9vPCb+rsNoDJUMm0/2dYG4dbDKJVCve6aYfEddlOxlTW +7wtjv592H9KGmf7+xMrcOt9Wvc1eDVvSrf6Ld9nv5Myd03YGYJau5JPPoyDVfCnI +MI8OMdNbEggXBSFFvlkU63JLgJGecuzJsVmb1MJjOMTuzOTl3WUvME8mtCdzZA53 +LrQCHKBfQsK4V5MNURxvmMrLytUfEzjjMsP65HCiaEz9GCsNliNvuCcCAwEAAQ== +-----END RSA PUBLIC KEY----- + From 5dbe872abfc1b09c51e453c7eacf5fa01802b9f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Feb 2015 06:15:17 +0100 Subject: [PATCH 068/132] Add simple check script: - check dns forward lookups - check reachability via icmpv4/icmpv6 echo request --- scripts/check | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 scripts/check diff --git a/scripts/check b/scripts/check new file mode 100644 index 0000000..4172ecc --- /dev/null +++ b/scripts/check @@ -0,0 +1,131 @@ +#!/usr/bin/env python + +import sys +import os +import socket +import subprocess +from optparse import OptionParser + + +def error(*arg): + print(*arg, file=sys.stderr) + + +def check_host_lookup(hostname, port): + try: + return socket.getaddrinfo(hostname, port) + except Exception as e: + error("DNS Lookup for {hostname} failed".format(hostname=hostname)) + return [] + + +def check_reachability(host, family): + if family is socket.AddressFamily.AF_INET: + process_name = 'ping' + else: + process_name = 'ping6' + child = subprocess.Popen([process_name, host, '-c', '1', '-W', '5'], + stdout=subprocess.PIPE) + child.communicate() + if child.returncode: + error("Host {host} is unreachable".format(host=host)) + return 0 if child.returncode == 0 else 1 + + +def get_hosts_data(srcdir): + for fname in sorted(list(set(os.listdir(srcdir)))): + if fname.startswith("."): + continue + + fpath = os.path.join(srcdir, fname) + if os.path.isfile(fpath): + with open(fpath) as f: + ignore_key = False + addresses = [] + port = 655 # tinc default port + + for line in f.readlines(): + + if '-----BEGIN RSA PUBLIC KEY-----' in line: + ignore_key = True + elif '-----END RSA PUBLIC KEY-----' in line: + ignore_key = False + + if line.startswith("#") or ignore_key: + continue + + chunks = line.split("=") + if len(chunks) == 2: + import pdb + # pdb.set_trace() + (k, v) = (x.strip().lower() for x in chunks) + + if k == "port": + try: + port = int(v) + except ValueError: + error("non-integer default port given") + elif k == "address": + if " " in v: + parts = v.split(' ') + if len(parts) != 2: + error("unknown address format") + try: + int(parts[1]) + addresses.append(parts) + except ValueError: + error("non-integer port given") + else: + addresses.append((v, None)) + elif k in ('ecdsapublickey'): + continue + else: + error("unknown key {key} with value {val}" + .format(key=k, val=v)) + + # set explicit port for address/port pairs + for i, addr in enumerate(addresses): + if addr[1] is None: + item = (addr[0], port) + addresses[i] = item + + yield(dict(community=fname, addresses=addresses)) + + +def do_checks(srcdir): + errcnt = 0 + for host in get_hosts_data(srcdir): + print("Checking {community}".format(community=host['community'])) + for address in host['addresses']: + host, port = address + + # dns lookup + records = check_host_lookup(host, port) + if not records: + errcnt += 1 + else: + for record in records: + if record[1] is not socket.SocketType.SOCK_DGRAM: + # we get SOCK_STREAM, SOCK_DGRAM and SOCK_RAW + # for every IP/Port pair, lets just pick one + # to have unique ip addresses + continue + errcnt += check_reachability(record[4][0], record[0]) + + print("{errcnt} errors".format(errcnt=errcnt)) + + return 0 if errcnt == 0 else 1 + + +if __name__ == "__main__": + parser = OptionParser() + parser.add_option("-s", "--sourcedir", dest="src", + help="Location of tinc host files. Default: ../hosts", + metavar="DIR", + default="../hosts/") + + (options, args) = parser.parse_args() + + ret = do_checks(options.src) + + sys.exit(ret) From be42ec4b68f4a96ad9540e215542683adfe877f3 Mon Sep 17 00:00:00 2001 From: hexa- Date: Fri, 6 Feb 2015 06:21:52 +0100 Subject: [PATCH 069/132] Add .travis.yml, fix executable flag on check script and remove pdb from imports --- .travis.yml | 5 +++++ scripts/check | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .travis.yml mode change 100644 => 100755 scripts/check diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9042af1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +sudo: false +language: python +python: + - "3.4" +script: scripts/check diff --git a/scripts/check b/scripts/check old mode 100644 new mode 100755 index 4172ecc..aad8271 --- a/scripts/check +++ b/scripts/check @@ -56,8 +56,6 @@ def get_hosts_data(srcdir): chunks = line.split("=") if len(chunks) == 2: - import pdb - # pdb.set_trace() (k, v) = (x.strip().lower() for x in chunks) if k == "port": From ea4c50f9e2b6a7050c77ff5cba0512e8cde0fc81 Mon Sep 17 00:00:00 2001 From: hexa- Date: Fri, 6 Feb 2015 06:25:23 +0100 Subject: [PATCH 070/132] travis: fix hosts path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9042af1..fb0abc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ sudo: false language: python python: - "3.4" -script: scripts/check +script: scripts/check -s ./hosts/ From 6b3a7fd55495c780f598160d28922fafeb6f5611 Mon Sep 17 00:00:00 2001 From: hexa- Date: Fri, 6 Feb 2015 06:28:54 +0100 Subject: [PATCH 071/132] travis: fix iputils-ping dependency --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb0abc5..be02140 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ -sudo: false language: python -python: - - "3.4" +python: "3.4" + +before_install: sudo apt-get install iputils-ping script: scripts/check -s ./hosts/ From 14b3a2910d226573a1bc3c0e35250bd4ae0e6776 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Fri, 6 Feb 2015 19:17:02 +0100 Subject: [PATCH 072/132] added hamburg01 --- hosts/hamburg01 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/hamburg01 diff --git a/hosts/hamburg01 b/hosts/hamburg01 new file mode 100644 index 0000000..4e6e83d --- /dev/null +++ b/hosts/hamburg01 @@ -0,0 +1,11 @@ +Address = 01.icvpn.hamburg.freifunk.net +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA3IbMWLjnM3S4HsFfKvhJdg9TYRPnzxRyL2CaL5KtcCTu8mMMOeCX +arfhaM0l7l/hr2/TrpjDH3NO+lT0mn9cwl1Jlq3bkNXiBghf+tgGJAr29DLm0teB +bvxy5YgL4qbWknNvqDRuLr7IFn0bScd8twN9mLeXzAmRCl43zzLMoYIf1A67Bt3H +pZ6MoIVF9ziw9E4s0cdaRx4S6Ok3h6ochCfoNAUAJhJvodOdjW9++Ffy+LLayBIZ +S21vezhhcb7fJ2qSO6x42Kp3FBaEY8zpOVdtPRX171xTUIv0vxYfRGsaOsT0biQc +EGCG3ch2HiwR7TDe4gpe7XV7+QpUY1dR/wIDAQAB +-----END RSA PUBLIC KEY----- From fd06115a8b6c4c8a02182450dec48a950091ed7b Mon Sep 17 00:00:00 2001 From: suicider Date: Fri, 6 Feb 2015 21:47:58 +0100 Subject: [PATCH 073/132] Create erfurt2 --- hosts/erfurt2 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/erfurt2 diff --git a/hosts/erfurt2 b/hosts/erfurt2 new file mode 100644 index 0000000..5313d12 --- /dev/null +++ b/hosts/erfurt2 @@ -0,0 +1,11 @@ +Adress = ffef.securegate.eu +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA0R+JEwwaxHJZsTlxTjpwDIjrSvbG6yCkeGO/zablrIdnoctZHgNQ +vcDvuSWeTThBvk7FVuOkgVbpcqTnDNzBNetV1SzpnQTG3yWJcADZtkt7oyEhkvV0 ++fJN4eALaOJT1d1PVROcLyCVjBIP5m+d9rImLRQK0tzQnLWofuqDLxzYm8UjK2Df +hZ4cHQNi0r8EPzQPzLjcz3YmYO6iJ1s27F6iXd16uBCoAX2y4QdSauHQiijah5bf +laM3ZD8ry9Sgrxngz169ybp3yB7l37IPWhVRHy+OISY4z2G5IMEnwkeS+P8eM36X +ZG//Jc/joqqHszKLUAL1zpfNVqygHs06fwIDAQAB +-----END RSA PUBLIC KEY----- From 6eca4fa2bf5f6692f575f688a97c53b255296952 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Feb 2015 22:54:16 +0100 Subject: [PATCH 074/132] erfurt2: fix address key typo --- hosts/erfurt2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/erfurt2 b/hosts/erfurt2 index 5313d12..06a2a65 100644 --- a/hosts/erfurt2 +++ b/hosts/erfurt2 @@ -1,4 +1,4 @@ -Adress = ffef.securegate.eu +Address = ffef.securegate.eu Port = 656 -----BEGIN RSA PUBLIC KEY----- From d797bf27a3cfdb095b55a66572f19b254dbc4be1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Feb 2015 01:27:51 +0100 Subject: [PATCH 075/132] Disable unreachable/unresolvable peers Commenting them out enables them to still be able to connect to the network, if they come back at some point. (cp. 954cf0da5aa8af1b6e1f32df4a57dccc078b2034) Details will follow on the icvpn mailing list. --- hosts/augsburg1 | 2 +- hosts/augsburg2 | 2 +- hosts/bayreuth1 | 2 +- hosts/ffhallevpn1 | 2 +- hosts/franken2 | 4 ++-- hosts/franken3 | 4 ++-- hosts/freiburg1 | 2 +- hosts/halle1 | 2 +- hosts/hamburg02 | 4 ++-- hosts/kiel3 | 2 +- hosts/koeln1 | 4 ++-- hosts/leipzig1 | 2 +- hosts/ljubljana1 | 2 +- hosts/magdeburg2 | 4 ++-- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hosts/augsburg1 b/hosts/augsburg1 index 3550946..dd08886 100644 --- a/hosts/augsburg1 +++ b/hosts/augsburg1 @@ -1,5 +1,5 @@ Address = augsburg1.icvpn.augsburg.freifunk.net -Address = 109.163.229.249 +# Address = 109.163.229.249 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBALVQaY0axASCewZdfMPbxUBwphhoDHKzm0SvpietNy0gy+43Jb+N/Cs+ d9l9HlAS2ngrCAahVm/GRA3iYHH2i5JdZnzxPFKdkefcZFz7x0ZDaqeqpb2YLWFs diff --git a/hosts/augsburg2 b/hosts/augsburg2 index ea73a25..4e71c79 100644 --- a/hosts/augsburg2 +++ b/hosts/augsburg2 @@ -1,4 +1,4 @@ -Address = augsburg2.icvpn.augsburg.freifunk.net +# Address = augsburg2.icvpn.augsburg.freifunk.net Address = augsburg2.icvpn.freifunk-augsburg.de -----BEGIN RSA PUBLIC KEY----- diff --git a/hosts/bayreuth1 b/hosts/bayreuth1 index 8930844..dd3c88f 100644 --- a/hosts/bayreuth1 +++ b/hosts/bayreuth1 @@ -1,4 +1,4 @@ -Address = freifunk-bt.criede.de +# Address = freifunk-bt.criede.de -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAppgeP431r3K4cgy9s1XUB/+SEb9F64Y9q34jxjwRssIaFx+mtukr JDLFtRNNTi7ao+kL3s1OBhavCeKwYSFAlaQnIm7fLwKwhJiIZwnKVM26SJPUwPfP diff --git a/hosts/ffhallevpn1 b/hosts/ffhallevpn1 index 56f0b31..2d3728f 100644 --- a/hosts/ffhallevpn1 +++ b/hosts/ffhallevpn1 @@ -1,5 +1,5 @@ Address = vpn1.freifunk-halle.de -Address = 88.198.51.136 +# Address = 88.198.51.136 Port = 655 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBALF/Wu4pe+f3dHeLYApHxUnOGUBzpNREUet6nDp80uWT/dph7h6Yqtz2 diff --git a/hosts/franken2 b/hosts/franken2 index 8767bcb..7a64878 100644 --- a/hosts/franken2 +++ b/hosts/franken2 @@ -1,5 +1,5 @@ -Address = gw2.fffranken.de -Port = 656 +# Address = gw2.fffranken.de +# Port = 656 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAOvt5phPFC+/KUvmGWJdNfIoPWuHfJb0na25VteGQDUMn0krudoIJQFb snELlAl5emnNbH7W5NWGKfjl7fMRC8RJ7r9eb1/jjsRlDK6aRnN8hHzcCa45PCeI diff --git a/hosts/franken3 b/hosts/franken3 index 2b22447..00c11e8 100644 --- a/hosts/franken3 +++ b/hosts/franken3 @@ -1,5 +1,5 @@ -Address = vpn3.fffranken.de -Port = 657 +# Address = vpn3.fffranken.de +# Port = 657 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAPIkkqmdnJi3Y+cGKslf0t+swE+7rtfRQTStW29MP62L6Sn0lxb5MufU LRtR0UW31SWQ03HGuUe51e16ppxZ3V1AFQvoLAwxwDD6VvBk4n+XEiupWPt+0XSd diff --git a/hosts/freiburg1 b/hosts/freiburg1 index e352511..d88b910 100644 --- a/hosts/freiburg1 +++ b/hosts/freiburg1 @@ -1,4 +1,4 @@ -Address = port-87-193-156-225.static.qsc.de +# Address = port-87-193-156-225.static.qsc.de -----BEGIN RSA PUBLIC KEY----- MIGJAoGBALo3VfMiPxK5lxWOYqoCZavMp8Lo4HYTmhLR6w3dHDJTI+UKTNDOf3Tc reO0q+K85uopAtuu9yEshMxapvmijmEO9YsD+XinLNvnwNxx7qSaVQrPFTa4MutK diff --git a/hosts/halle1 b/hosts/halle1 index e8e04c2..0cb00eb 100644 --- a/hosts/halle1 +++ b/hosts/halle1 @@ -1,4 +1,4 @@ -Address = ffvpn.3dfxatwork.de +# Address = ffvpn.3dfxatwork.de -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsYzXhlTKxR7YBUXHY0JscmtNbrFzZzviVzIhpuml499rh8TVhjMU ozyjbaPhSUy+9RY4F1WpRmDi3lyDx7eT0viRlOkFG8huApXEgGLQgah0M/pfwkc1 diff --git a/hosts/hamburg02 b/hosts/hamburg02 index b52d8c1..b282957 100644 --- a/hosts/hamburg02 +++ b/hosts/hamburg02 @@ -1,5 +1,5 @@ -Address = 02.icvpn.hamburg.freifunk.net -Port = 656 +# Address = 02.icvpn.hamburg.freifunk.net +# Port = 656 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEApyg+KLP9XfIwOIgBHjbGgt0l5ve+/O1Mec3ed/d0q6Bh+oTkJxOn diff --git a/hosts/kiel3 b/hosts/kiel3 index 67a2736..3c83829 100644 --- a/hosts/kiel3 +++ b/hosts/kiel3 @@ -1,4 +1,4 @@ -Address=vpn3.freifunk.in-kiel.de +# Address=vpn3.freifunk.in-kiel.de -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAqDth8oT1QRrt1usUz2qb+QfWCrva67Vup3TOuV1Lf6Zo6veRDOcT 3jCQtQ+BYGAiLgwhrYtJ13oiMlTbpd32ns1dvp5BgaiTWexJuObsC04LVry0kML5 diff --git a/hosts/koeln1 b/hosts/koeln1 index 2c6de0e..b695e20 100644 --- a/hosts/koeln1 +++ b/hosts/koeln1 @@ -1,5 +1,5 @@ -Address = fastd3.kbu.freifunk.net -Port = 656 +# Address = fastd3.kbu.freifunk.net +# Port = 656 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAwzH7Z0W0yIDp80G8sHpaxez7GXL3Lql7DAdJkrNf6KEzZAsZ7usn diff --git a/hosts/leipzig1 b/hosts/leipzig1 index 7163162..4f25546 100644 --- a/hosts/leipzig1 +++ b/hosts/leipzig1 @@ -1,4 +1,4 @@ -Address = vpn1.leipzig.freifunk.net +# Address = vpn1.leipzig.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAKL7eWHmD2Rn6IP7JlSWtkphokN785g8nccBmfcjbwEwiZv+EFaVoid/ 0dPfvHaX0GaQGOhpef3PVHEbIMuU8dD9+7WbXO3+hUSIAfHoIdGK7n8qFtzTpzqn diff --git a/hosts/ljubljana1 b/hosts/ljubljana1 index ef99e59..c8dda7d 100644 --- a/hosts/ljubljana1 +++ b/hosts/ljubljana1 @@ -1,4 +1,4 @@ -address = gw.kiberpipa.net +# address = gw.kiberpipa.net -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAL4X76pBCF0b/z45rFPbgTrKpISle9MbLqvq3tDc2fTERowis0aBTTuK mfVIQkF3W+8JMcjQdez5tQWKHnfpz4PmdSC4Dmxolgk/d9b7HNQTP8MCmCLzf+D7 diff --git a/hosts/magdeburg2 b/hosts/magdeburg2 index d2de335..6f2b7e9 100644 --- a/hosts/magdeburg2 +++ b/hosts/magdeburg2 @@ -1,5 +1,5 @@ -Address = 2.icvpn.md.freifunk.net -Port = 656 +# Address = 2.icvpn.md.freifunk.net +# Port = 656 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA6v9HoQhGnAaWsSofuT4gplTOBhzmDz23wdQeWkVKM2tY7WCA1KNO From 19b11aed548790e7db2078eb5606404619468a18 Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Tue, 10 Feb 2015 23:43:04 +0100 Subject: [PATCH 076/132] remove static ip address --- hosts/augsburg1 | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/augsburg1 b/hosts/augsburg1 index dd08886..2645f91 100644 --- a/hosts/augsburg1 +++ b/hosts/augsburg1 @@ -1,5 +1,4 @@ Address = augsburg1.icvpn.augsburg.freifunk.net -# Address = 109.163.229.249 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBALVQaY0axASCewZdfMPbxUBwphhoDHKzm0SvpietNy0gy+43Jb+N/Cs+ d9l9HlAS2ngrCAahVm/GRA3iYHH2i5JdZnzxPFKdkefcZFz7x0ZDaqeqpb2YLWFs From 423c038a49d18dc8db6212a11e4919b1922e7f54 Mon Sep 17 00:00:00 2001 From: hexa- Date: Thu, 12 Feb 2015 18:12:29 +0100 Subject: [PATCH 077/132] Housekeeping: Remove hosts that were not updated after being disabled in 2014/08 and are still unreachable --- hosts/Treuenbrietzen | 6 ------ hosts/badzwischenhahn1 | 7 ------- hosts/castrop1 | 10 ---------- hosts/hannover1 | 6 ------ hosts/koblenz1 | 9 --------- hosts/ljubljana2 | 6 ------ hosts/schwarzach1 | 10 ---------- 7 files changed, 54 deletions(-) delete mode 100644 hosts/Treuenbrietzen delete mode 100644 hosts/badzwischenhahn1 delete mode 100644 hosts/castrop1 delete mode 100644 hosts/hannover1 delete mode 100644 hosts/koblenz1 delete mode 100644 hosts/ljubljana2 delete mode 100644 hosts/schwarzach1 diff --git a/hosts/Treuenbrietzen b/hosts/Treuenbrietzen deleted file mode 100644 index 3bc18a0..0000000 --- a/hosts/Treuenbrietzen +++ /dev/null @@ -1,6 +0,0 @@ -#Address = shonyt.mine.nu ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBANbR3LhhWFNt9ak//ZTReEuNQHjibgTAM+cNTDwLevudrP3y9htxTzgF -UZDHnkbDqwrYNjnuaMLIik7ljj5aKQd+fXmv3S+sFvvaPnm+e7Fpt+r/ReTnS6su -iOdmQ7XgC/b6r5ISjGhSheHcVSNMmbDWwYISSpDTu9S5qcUAkp1jAgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/hosts/badzwischenhahn1 b/hosts/badzwischenhahn1 deleted file mode 100644 index b5ae63c..0000000 --- a/hosts/badzwischenhahn1 +++ /dev/null @@ -1,7 +0,0 @@ -#Address = ffbz.ath.cx -#Port = 655 ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAMlCF8Yj3adfH6Mssc7J59CMIzO4ZTa4meHXDaGWHXzGIMnUWRUlLIfp -7sa/uJ4U9iQU3ZEwv1cPWweDvWrG1HNL+oJEVv7xQWcBXaYnm0le305qom0E0U5U -cMt+yNZWTh2KfgJjGB78FuOas1yiGpVPnV2wAGgzREKgmiXTOzZnAgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/hosts/castrop1 b/hosts/castrop1 deleted file mode 100644 index b2e0df1..0000000 --- a/hosts/castrop1 +++ /dev/null @@ -1,10 +0,0 @@ -#Address = ffcas.no-ip.info ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAr1d6XRKMLgt853J8qxguOb017hjVSB4LNWKiLEXk1K5B4sPBP3Sj -6/3PjI38dbZsmWqOV6azMmqTeBjBKt1Ii02sfrIB0hc3JuwcCeLLrPtmxUWCIXon -pA0gv1mstM5BY4HLgfH9h9iwtTQ80k3BaTz5/Wcn3i3tRm/MLeXKNIRbIYLGxmyQ -aSE4QJCnWPXxW+FoKRY6u4jAmYeVi+OyF3Hg9HnVvsBV3AeQ4Ptb90Pkr76udN4D -W5rEIJelvAT2bMGlCZgowtCEgEAVqI2YHujndHemsUv/ApYR1xwKWRB/df9O8Fpr -HqdYAjpMtYoGfBj0UhulKZtHpM06LGDZNQIDAQAB ------END RSA PUBLIC KEY----- - diff --git a/hosts/hannover1 b/hosts/hannover1 deleted file mode 100644 index 95a691b..0000000 --- a/hosts/hannover1 +++ /dev/null @@ -1,6 +0,0 @@ -#Address = vpn.hannover.freifunk.net ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAJsf2VLpTQlglzwBWe2B9RIgTEl4Y2a22Xt0DMPRw2vRc4aLcYh9G9TC -IvlXl87TKILdkZ8jlK9cMmwupAmtoxlRUCDkode1dqZ/Knf+iIOCP3jBPDggKKcR -/8MmS/ao+Ujb9tTuzv8KhVOqAcezKAHh1rVjriVyhCS/PhmZDViZAgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/hosts/koblenz1 b/hosts/koblenz1 deleted file mode 100644 index 52e3e23..0000000 --- a/hosts/koblenz1 +++ /dev/null @@ -1,9 +0,0 @@ -#Address=dsserver.homelinux.org ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsnls6tKZlZLjmOhjiMTh63GbOaEJ5L3/N4WQPNZN67YOoL0ISECv -QeQ/p/3iRRhN4EG58CxAJ0X8uqpjqP6xLcbBSDfLbAawjFzU7OrKWiCAmHeW5ZTk -5sRc6FlR45x63AkaUxiX8VEjBLdrxr6WlHG7XdJtaSYtSpeCESjtWnD3qSQVl7Zr -CNekrY0TUC4Q0nlmKhNnSISMmJxqvrlGvV+shH2QKSSTOyvOYhl7SwQpJHKfuIOx -9RbWDG4rrcqks/Kx4WBq/hwiUa8cy0tdoZcbrbjt6rzdIgByDQvcNJ0+hjypbW7H -j0nr+4GJ9zRGWvE2KopZ3WHE3SvvBeHynQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/ljubljana2 b/hosts/ljubljana2 deleted file mode 100644 index 0a39b02..0000000 --- a/hosts/ljubljana2 +++ /dev/null @@ -1,6 +0,0 @@ -#Address = AS64768.linuxshell.org ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBALVdchpMeSOA0JBBLwMMdX7hVMlLI2nXZ/0+b8R+36chmsajbKjsDa04 -aw/t/YFo7iLFi3AAXj7Tm/8AXkRz6Rf93rplwo91k47Dz4iEwC/kn7kI8wrGyaTY -iVdBNp2InZzDeD621OfJa1nhh5ROI0q8T0P76b29Z6XkYJJpCa9pAgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/hosts/schwarzach1 b/hosts/schwarzach1 deleted file mode 100644 index 2bc46bf..0000000 --- a/hosts/schwarzach1 +++ /dev/null @@ -1,10 +0,0 @@ -#Address = schwarzach1.hopto.org - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEApZQmRinQZQq7gPjFmltgFxXAv4REhkCAGcPwYl3uUeOwqe4adSDu -90G99x2sCMAdteQ5YrZsDqYw2DQJS4F0a5IF81+U4wfv97KNil/DG0rxqXALX8v0 -OWfkUJUiblegeBo5R7/x+wDtdJbzmLszsfObo5W+jiyBSBM37RoHI2lfYEhu1+GE -2t1xWhZXsn65krEnF0mwg6sHzZPza051cQiCLIMSyqmI5jk17FzHfuKwdSKFQKMN -7rhVwgUgzL6RI5HQYDNjM5VEKHShIZ0MUvUQlhQuZglzIS9W0kvBhAFWg1zkUpaH -pGl/IK7z2VS5oayGIOpX8e/B0ITWuuzxVQIDAQAB ------END RSA PUBLIC KEY----- From 0613919bed06e540d33365b5a301da1987908de3 Mon Sep 17 00:00:00 2001 From: hexa- Date: Thu, 12 Feb 2015 18:39:05 +0100 Subject: [PATCH 078/132] README.md: Travis-CI state --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 40e50e0..0929bc1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/freifunk/icvpn.svg?branch=master)](https://travis-ci.org/freifunk/icvpn) + This repository holds IC-VPN keys and configuration. For more Info see http://wiki.freifunk.net/IC-VPN From 52013714c9e3f7058ba33ad16356061d35873762 Mon Sep 17 00:00:00 2001 From: hexa- Date: Tue, 17 Feb 2015 15:36:47 +0100 Subject: [PATCH 079/132] check: udp port reachability through nmap, pass getaddressinfo records where possible --- .travis.yml | 11 +++++++--- .travis_requirements.txt | 1 + scripts/check | 44 ++++++++++++++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 .travis_requirements.txt diff --git a/.travis.yml b/.travis.yml index be02140..9ae342b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ language: python python: "3.4" - -before_install: sudo apt-get install iputils-ping -script: scripts/check -s ./hosts/ +before_install: + - sudo apt-get install iputils-ping checkinstall + - wget https://www.linuxlounge.net/~martin/icvpn/nmap_6.47-1_amd64.deb + - sudo dpkg -i nmap_6.47-1_amd64.deb +install: + - pip install -r .travis_requirements.txt +script: + - sudo bash -c "source ~/virtualenv/python3.4/bin/activate && scripts/check -s ./hosts/" diff --git a/.travis_requirements.txt b/.travis_requirements.txt new file mode 100644 index 0000000..e33c53f --- /dev/null +++ b/.travis_requirements.txt @@ -0,0 +1 @@ +python-nmap diff --git a/scripts/check b/scripts/check index aad8271..629a5aa 100755 --- a/scripts/check +++ b/scripts/check @@ -4,6 +4,7 @@ import sys import os import socket import subprocess +import nmap from optparse import OptionParser @@ -14,12 +15,15 @@ def error(*arg): def check_host_lookup(hostname, port): try: return socket.getaddrinfo(hostname, port) - except Exception as e: + except Exception: error("DNS Lookup for {hostname} failed".format(hostname=hostname)) return [] -def check_reachability(host, family): +def check_icmp_reachability(gai_record): + host = gai_record[4][0] + family = gai_record[0] + if family is socket.AddressFamily.AF_INET: process_name = 'ping' else: @@ -28,8 +32,27 @@ def check_reachability(host, family): stdout=subprocess.PIPE) child.communicate() if child.returncode: - error("Host {host} is unreachable".format(host=host)) - return 0 if child.returncode == 0 else 1 + error(" - {host} is icmp unreachable".format(host=host)) + return True if child.returncode == 0 else False + + +def check_udp_reachability(gai_record): + host, port = gai_record[4][:2] + family = gai_record[0] + + if family is socket.AddressFamily.AF_INET: + arguments = '-sU -PN' + else: + arguments = '-sU -PN -6' + + scanner = nmap.PortScanner() + result = scanner.scan(host, str(port), arguments) # -sU requires root + state = result['scan'][host]['udp'][port]['state'] + + if state == 'closed': + print(" - {host} port {port}/udp is {state}" + .format(host=host, port=port, state=state)) + return False if state == 'closed' else True def get_hosts_data(srcdir): @@ -104,11 +127,16 @@ def do_checks(srcdir): else: for record in records: if record[1] is not socket.SocketType.SOCK_DGRAM: - # we get SOCK_STREAM, SOCK_DGRAM and SOCK_RAW - # for every IP/Port pair, lets just pick one - # to have unique ip addresses + # vpn connections are udp based, so skip + # everything else continue - errcnt += check_reachability(record[4][0], record[0]) + + if not check_icmp_reachability(record): + errcnt += 1 + else: + port_state = check_udp_reachability(record) + if not port_state: + errcnt += 1 print("{errcnt} errors".format(errcnt=errcnt)) From 733c614ded8aae76f86049934f9b468ddbdbd04a Mon Sep 17 00:00:00 2001 From: hexa- Date: Tue, 17 Feb 2015 17:26:47 +0100 Subject: [PATCH 080/132] Frankfurt1 to lowercase, for sort order --- hosts/{Frankfurt1 => frankfurt1} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hosts/{Frankfurt1 => frankfurt1} (100%) diff --git a/hosts/Frankfurt1 b/hosts/frankfurt1 similarity index 100% rename from hosts/Frankfurt1 rename to hosts/frankfurt1 From c430991d41aa219157570e4b634e097c46606232 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Wed, 18 Feb 2015 10:14:38 +0100 Subject: [PATCH 081/132] post-merge: Use absolute path for invoke-rc.d. When the hook is triggered due to an cron job, the path may not contain "/usr/sbin/" and thus the daemon reload is not happening. --- scripts/post-merge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/post-merge b/scripts/post-merge index f45b79f..7adba43 100755 --- a/scripts/post-merge +++ b/scripts/post-merge @@ -25,6 +25,6 @@ for HOST in hosts/*; do echo "ConnectTo = ${HOST##*/}" >> $TINCCFG done -invoke-rc.d tinc reload icvpn +/usr/sbin/invoke-rc.d tinc reload icvpn exit 0 From b39f9a670999b42ae7fa21ee1e88ecf700b5fa90 Mon Sep 17 00:00:00 2001 From: Kevin Kirsch Date: Tue, 24 Feb 2015 19:23:34 +0100 Subject: [PATCH 082/132] Added key for trier1 --- hosts/trier1 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/trier1 diff --git a/hosts/trier1 b/hosts/trier1 new file mode 100644 index 0000000..500dc80 --- /dev/null +++ b/hosts/trier1 @@ -0,0 +1,15 @@ +Address = gw1.freifunk-trier.starletp9.de +Port = 655 +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAtZakSOECioGgkCutgDyq28LLklVstsowc4oahDHhQt5pTv0ncUzE +D1rAVWGxYQuD21wu2gCW6zJpS+ZYxGnREIa799tdRtBSL/bH6QQsVpiQiWzpMk0D +HyOh17fbtqAekOzz3nY6hQFcB3CaJoqY2jrI/iQE15N1iNkA8m1nDnwpHxVtKNmh +9qq+2EtdXuuJP6o7gayjMLXiB0Iaz6rehlS8jzh6FdrCUQbyuRPW/XtT4tiwd0Ch +lVXoCnSrM0+tUW++0yQz9aCpLE+IMKcTGm1W3elNOA107R9BiJrPqM3ClP05ThRx +qWO/hCeJ7/Y0wFZBM2IWNX5ig3bAyhdUOaZA2Pr3HQ7dxRkHMDPOOjIzxPNQUvCm +M4yKXoC9Fuhy7iujd7fVovXqvwBfLAhm/krMZRftEU01qHdN+Qiemqawz/zx9Yok +GJwrVEttqXt1CP0yrm2GpLS0YOFCcTO6OGnzOP1AyCi8XjeoshqhT1GgHGky8TMs +GhMD227a9AIK+XTIGzvOEpYC04CYm9zcWBbcLwQZxZuX4XUIhCsgFtWYN0qHTbc3 +ivhy6Z/MPvJGxiGbipMeZlHu4fEKCtOu4EdddkFLlMKdpA7Jo8PEMXy1zg+LRgWt +qZJ6AL52KEnR+2zjl3aLoXJ7H0eTAGJjiSMDfp4PXiIWr5amoH7d8QUCAwEAAQ== +-----END RSA PUBLIC KEY----- From e0b61477b96e107193a20d58765cd57027526056 Mon Sep 17 00:00:00 2001 From: do9xe Date: Tue, 24 Feb 2015 22:13:46 +0100 Subject: [PATCH 083/132] this key got lost --- hosts/flensburg1 | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 hosts/flensburg1 diff --git a/hosts/flensburg1 b/hosts/flensburg1 deleted file mode 100644 index 49f9fe1..0000000 --- a/hosts/flensburg1 +++ /dev/null @@ -1,10 +0,0 @@ -Address = fl1.icvpn.freifunk-flensburg.de -Port = 656 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAv9Ow8Vkxo03MaYxxpdjQ1/tce2BgyON3+HkHd7/s90wovB6kkFpY -jL+c6nqN8kIBPhAw4Ibz6HmwUm6GIgappkwI2B81TTfrF2k4LR0NX+Nbyw2UqpnF -mt4O4ZRDBoRPRJxyXHgxLox0/VqEH+F044nO5DVaCJihlDDVnmjqvdvazBLjsTrX -d08gPKkyD/VdUMaX6d5eZOfxzRiPYMpZE0rWMzQc+n1kvw1DXfk/jhawqf4ZpaH3 -TD/DGzeuXnDjL2IxMYXHABdfZUug2r7eoP38UM7jVop32SVXQO95gBDs5hTzp9Wh -JdSYnxO3HgIRb+0g3a7Aq9KBBlQ6xCfZjwIDAQAB ------END RSA PUBLIC KEY----- From 4ffd0818a78d0d8e1322400b38f71d26ea1514aa Mon Sep 17 00:00:00 2001 From: do9xe Date: Tue, 24 Feb 2015 22:14:55 +0100 Subject: [PATCH 084/132] delete kiel3, add kiel4 --- hosts/kiel3 | 9 --------- hosts/kiel4 | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 hosts/kiel3 create mode 100644 hosts/kiel4 diff --git a/hosts/kiel3 b/hosts/kiel3 deleted file mode 100644 index 3c83829..0000000 --- a/hosts/kiel3 +++ /dev/null @@ -1,9 +0,0 @@ -# Address=vpn3.freifunk.in-kiel.de ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAqDth8oT1QRrt1usUz2qb+QfWCrva67Vup3TOuV1Lf6Zo6veRDOcT -3jCQtQ+BYGAiLgwhrYtJ13oiMlTbpd32ns1dvp5BgaiTWexJuObsC04LVry0kML5 -WyoInGpUD26sqPdXtcs9bAgNzkDCm7cxMtQiu4SGWyNYpfkkIb+4miUKyjnWCrqi -nWTX2KC4MJh7AMWSrk6vX7aYmV/qmHkIXBqhPKe0Ah6rufc8+ZkSATJJxTM78qwD -sOO78I3V6av1+QlaF9wCr5/X/eAD6XUEOJWPuiTflC27mDcihW2NE2YwCIDX8vk0 -Ccuo6OGrjJpZz+ncEjCcFICPpKrL8kYCdwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/kiel4 b/hosts/kiel4 new file mode 100644 index 0000000..5a98c54 --- /dev/null +++ b/hosts/kiel4 @@ -0,0 +1,11 @@ +Address = vpn4.freifunk.in-kiel.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA49H0NRDyDqVy5eJygLHuwLq7VUhrPhyGMhHNcbJ/ZgnwAMkV2wfd +A+fO4ZXZ498rW3jNLvIxpUH81jsQBe4rFkvnTGZQcY2Lu7Q46XGIp4BNPjtUFIeH +1qhSANElylo6sZtu651pj2Lu3oV/9cxPDLrKWFaLSLmCrJoh9gkB4Xk4T0T7RWxG +NyNqdwcCzd+9ITIpRFtcB/pxlO/Ovirvwie+N/aZw8uC52ZOskhI/MSEYzFw+YYR +aWcoc1sAJ935EY7DET0MV/9yuM+hfRQyex3jKkXzykQL8kQ4t1+0dl3VYMiW6lr6 +LeCasMGtby5sVeA/18H+fu+viZ+qc+wn9wIDAQAB +-----END RSA PUBLIC KEY----- From 92b783e197168e96b54c7306d810cd44712edb5a Mon Sep 17 00:00:00 2001 From: bodems Date: Sat, 14 Mar 2015 19:46:52 +0000 Subject: [PATCH 085/132] added bielefeld4 --- hosts/bielefeld4 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 hosts/bielefeld4 diff --git a/hosts/bielefeld4 b/hosts/bielefeld4 new file mode 100644 index 0000000..1a60112 --- /dev/null +++ b/hosts/bielefeld4 @@ -0,0 +1,12 @@ +Address = vpn4.freifunk-bielefeld.de +Port = 655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvOJHnI0VCn4ZOVitzitHPHpxHesW4TYf7QafYU6ClQy/Sy9WN5Eg +lrfszpwZmzABnJZ7T7BQN8j91neKwzj10qr6ppLCDavP0nqQ0CJ+Bg7SCc6HJbsQ +aDTU1lvNcGKKPD+KchSNxUkOBZjZavVw01taztEnYy6hUy/ml8vdLTUjBBPMUQ0+ +rTe5m/rjPim5J4Eo56kRoJ2TQ3bRNZwTAgV07NAosO5V1qUncPoYsMmS6RrbBVxj +q7UOEyegBrsFF0F5tdK/itvZIWD2T/0DlDUqoPmfh2j+urbzYwAw9VBc1+4DByfS +Unn0cQ8AccXTDtMWQVOrLxIhm0JCmiDi6wIDAQAB +-----END RSA PUBLIC KEY----- + From 732d013b39760e229cd42f7fa71d249938f1754a Mon Sep 17 00:00:00 2001 From: bodems Date: Sat, 14 Mar 2015 19:47:14 +0000 Subject: [PATCH 086/132] removed bielefeld2 --- hosts/bielefeld2 | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 hosts/bielefeld2 diff --git a/hosts/bielefeld2 b/hosts/bielefeld2 deleted file mode 100644 index af6ab59..0000000 --- a/hosts/bielefeld2 +++ /dev/null @@ -1,10 +0,0 @@ -Address = vpn2.freifunk-bielefeld.de - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAuNUlmNeftDUvk7FAJFvX7XwI9CYnEpdU7TD3waeE6ZbU1mSW0d+n -9MUArA1iprh9UlPchGrkluIV6lX1XaVYzeXy4HVtf5nLUBssCnbBN8T1PE2qD0rS -pYKQEc/C1fuGLx07uzKHpz9PufOZQrmiRzoAciZBRZ0y16wtkO5aKV+cHawnnaP2 -rzKeNIKq+XvusalDf0gftr0znivFeHZk7C2XzZ27HjJGcZM8k/xtMiCfMVo6NpZX -s9hkCrbT6vKtTVWCdAMcZAk0taF8eTPxkRoMMADExeXcoQXIxazvfdV0z+ou/2it -5X3PohGtF70ZoT98OT2s3xETCea1JyOyDQIDAQAB ------END RSA PUBLIC KEY----- From 17b07bf03ea219eb0dbf237464994178058e6d0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 15 Mar 2015 01:33:38 +0100 Subject: [PATCH 087/132] Update darmstadt1, darmstadt2 --- hosts/darmstadt1 | 2 +- hosts/darmstadt2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/darmstadt1 b/hosts/darmstadt1 index a0d26c8..f843846 100644 --- a/hosts/darmstadt1 +++ b/hosts/darmstadt1 @@ -1,4 +1,4 @@ -Address = gw01.icvpn.darmstadt.freifunk.net +Address = gw03.darmstadt.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAsFBR3wzdRoFXDy38HQtlYDKHvsbY99fUkPZXxg5v3dBGIfWDWMBR diff --git a/hosts/darmstadt2 b/hosts/darmstadt2 index 80e3f39..535dcf9 100644 --- a/hosts/darmstadt2 +++ b/hosts/darmstadt2 @@ -1,4 +1,4 @@ -Address = gw02.icvpn.darmstadt.freifunk.net +Address = gw04.darmstadt.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAuohUruR8enzVN1IswdzMuf8f3rY2HOK/yByItBcMHM9b4HMe6Jt6 From 65fa913eab19e3af317d32ac47dcd792c48c5844 Mon Sep 17 00:00:00 2001 From: root-user Date: Sat, 21 Mar 2015 16:44:43 +0100 Subject: [PATCH 088/132] Add bremen3 --- hosts/bremen3 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/bremen3 diff --git a/hosts/bremen3 b/hosts/bremen3 new file mode 100644 index 0000000..10efae0 --- /dev/null +++ b/hosts/bremen3 @@ -0,0 +1,11 @@ +Address = vpn03.bremen.freifunk.net +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAr7aAgyRdDjTjJyUhHaPd8aZIybNvi+paDKwkRJFUEHybsSsZs8pl +mJl+wFFn3sW3y6R7th1iVSqHDU85KYpy7CemKcHRo0VVl0OayToKQGUc9wuUkjM2 +XIpZ6WxJ2+B918780dFA5esdeigSTXnKABt80wllLmBumiumj6fGQnzXOFMfyWSI +TlpW77EQqZY3uXGlZjbzmCbzmspbldHZKwUBr1f8GW6pdeMzEeptg/5nVLLu0rG+ +o+rXQuU2GxJXd6OwrIWEzLCpxbRNqZ6Xo2o1U4Mc3vrKv7yQ61xY/hYB7BLU89Dz +tTNXWxy4cm/xYdxmCBStzWGwNRndqNY7fwIDAQAB +-----END RSA PUBLIC KEY----- From 3d07e8648902313c08cd1577db24de36439de3a9 Mon Sep 17 00:00:00 2001 From: paalsteek Date: Sat, 21 Mar 2015 23:09:48 +0100 Subject: [PATCH 089/132] add westpfalz2 --- hosts/westpfalz2 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/westpfalz2 diff --git a/hosts/westpfalz2 b/hosts/westpfalz2 new file mode 100644 index 0000000..68605b8 --- /dev/null +++ b/hosts/westpfalz2 @@ -0,0 +1,11 @@ +Address = gw02.freifunk-westpfalz.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvBxfjw2x1RB9nlypB0uXbb0Ad+bsPA3lVPUTiqf1jp9J7mq3SzQr +8XXbXSfYENjyLw6rif/7fYvnZsV9Pn+pj+sw7Hwj4JKyloNmLGe26youx+Ik3YXj +kvmPAF+6SShVAv4TEbOeqVNMggksXevJawPdR9lUrdu86uT49ncAWh29x9LBtLM7 +ZzxacAn/ysIsH8oY+niFT0xTysLD0mxbvWuSrXjFaL4zTtGyT1jOvLyTvkpE10OK +bVid5JGlkK8+NWFC6pruy1UR0j3+OZ7lsiQsEFrBcj08Dot/msXlvYjcDVtCVFMU +/SAolG+xq5Olg8dOql4E64N5yoLp7wbTRwIDAQAB +-----END RSA PUBLIC KEY----- From 7e72c4403f12cdc5bf01b70f4884b1320d31bc84 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 22 Mar 2015 17:10:02 +0100 Subject: [PATCH 090/132] darmstadt: update to ipv4 only hostnames for now --- hosts/darmstadt1 | 2 +- hosts/darmstadt2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/darmstadt1 b/hosts/darmstadt1 index f843846..813f3c5 100644 --- a/hosts/darmstadt1 +++ b/hosts/darmstadt1 @@ -1,4 +1,4 @@ -Address = gw03.darmstadt.freifunk.net +Address = ip4.gw03.darmstadt.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAsFBR3wzdRoFXDy38HQtlYDKHvsbY99fUkPZXxg5v3dBGIfWDWMBR diff --git a/hosts/darmstadt2 b/hosts/darmstadt2 index 535dcf9..c854b1b 100644 --- a/hosts/darmstadt2 +++ b/hosts/darmstadt2 @@ -1,4 +1,4 @@ -Address = gw04.darmstadt.freifunk.net +Address = ip4.gw04.darmstadt.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAuohUruR8enzVN1IswdzMuf8f3rY2HOK/yByItBcMHM9b4HMe6Jt6 From 6fe2c149766d1c95190f4be2bba27374cfaad103 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 22 Mar 2015 17:57:14 +0100 Subject: [PATCH 091/132] check: be more verbose --- scripts/check | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/scripts/check b/scripts/check index 629a5aa..dc7235b 100755 --- a/scripts/check +++ b/scripts/check @@ -7,9 +7,28 @@ import subprocess import nmap from optparse import OptionParser +ip4, ip6 = 0, 0 + + +ANSI_COLOR_ERR = "\x1b[31m" +ANSI_COLOR_WARN = "\x1b[33m" +ANSI_COLOR_OK = "\x1b[32m" +ANSI_COLOR_RESET = "\x1b[0m" + def error(*arg): - print(*arg, file=sys.stderr) + print(ANSI_COLOR_ERR, *arg, file=sys.stderr, + end='%s\n' % ANSI_COLOR_RESET) + + +def warn(*arg): + print(ANSI_COLOR_WARN, *arg, file=sys.stderr, + end='%s\n' % ANSI_COLOR_RESET) + + +def ok(*arg): + print(ANSI_COLOR_OK, *arg, file=sys.stderr, + end='%s\n' % ANSI_COLOR_RESET) def check_host_lookup(hostname, port): @@ -32,11 +51,13 @@ def check_icmp_reachability(gai_record): stdout=subprocess.PIPE) child.communicate() if child.returncode: - error(" - {host} is icmp unreachable".format(host=host)) + error("{host} is icmp unreachable".format(host=host)) return True if child.returncode == 0 else False def check_udp_reachability(gai_record): + global ip4, ip6 + host, port = gai_record[4][:2] family = gai_record[0] @@ -50,8 +71,17 @@ def check_udp_reachability(gai_record): state = result['scan'][host]['udp'][port]['state'] if state == 'closed': - print(" - {host} port {port}/udp is {state}" + error("{host} port {port}/udp is {state}" .format(host=host, port=port, state=state)) + else: + ok("{host} port {port}/udp is {state}" + .format(host=host, port=port, state=state)) + + if family is socket.AddressFamily.AF_INET: + ip4 += 1 + else: + ip6 += 1 + return False if state == 'closed' else True @@ -114,9 +144,16 @@ def get_hosts_data(srcdir): def do_checks(srcdir): + global ip4, ip6 + errcnt = 0 + warncnt = 0 + for host in get_hosts_data(srcdir): print("Checking {community}".format(community=host['community'])) + if not host['addresses']: + warn("no addresses specified") + warncnt += 1 for address in host['addresses']: host, port = address @@ -126,7 +163,7 @@ def do_checks(srcdir): errcnt += 1 else: for record in records: - if record[1] is not socket.SocketType.SOCK_DGRAM: + if record[1] is not socket.SOCK_DGRAM: # vpn connections are udp based, so skip # everything else continue @@ -138,7 +175,10 @@ def do_checks(srcdir): if not port_state: errcnt += 1 - print("{errcnt} errors".format(errcnt=errcnt)) + print("\nfound {}/{} working ipv4/ipv6 peers".format(ip4, ip6)) + + error("{} errors".format(errcnt)) + warn("{} warnings".format(warncnt)) return 0 if errcnt == 0 else 1 From 1dfac5a953e3f3c24b714590c2e8e65c522651c9 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Mon, 23 Mar 2015 15:41:36 +0100 Subject: [PATCH 092/132] Rename bremen3 -> bremen1 --- hosts/bremen1 | 17 ++++++++--------- hosts/bremen3 | 11 ----------- 2 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 hosts/bremen3 diff --git a/hosts/bremen1 b/hosts/bremen1 index 25b6df6..31916c3 100644 --- a/hosts/bremen1 +++ b/hosts/bremen1 @@ -1,12 +1,11 @@ Address = vpn01.bremen.freifunk.net Port = 656 ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy2FfayKB0nuggl/B9Lff -lLAWf92KPDtmJt6un1nRylX99n1yTatnnzW9r4dv7oDKJVEGxOe9d17CIg0l/lQQ -UDC0sBJmB+JLQE8INHASQPcRbQVvlRrq+jVSUbpezA8H4W/FDc0kyERJG4zHAW4b -Om0c8ndFZBU2eMXTyaeFZ5gi6AETZ+GAOt3BGP3lhzVMIotnSf5Mm1q5EOejjlND -dsz3Fsn3ScWgVeUCjwWK1xs/jg5+pa90he/eqO+DmihxDA0006YBnQcA0kiprjK2 -k6Jo8J1KWD8G3m0XvWOu9z15WAKvkNSw96h28eGefsgQP+XEpEE9aWGcbuj88ycK -dwIDAQAB ------END PUBLIC KEY----- +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAr7aAgyRdDjTjJyUhHaPd8aZIybNvi+paDKwkRJFUEHybsSsZs8pl +mJl+wFFn3sW3y6R7th1iVSqHDU85KYpy7CemKcHRo0VVl0OayToKQGUc9wuUkjM2 +XIpZ6WxJ2+B918780dFA5esdeigSTXnKABt80wllLmBumiumj6fGQnzXOFMfyWSI +TlpW77EQqZY3uXGlZjbzmCbzmspbldHZKwUBr1f8GW6pdeMzEeptg/5nVLLu0rG+ +o+rXQuU2GxJXd6OwrIWEzLCpxbRNqZ6Xo2o1U4Mc3vrKv7yQ61xY/hYB7BLU89Dz +tTNXWxy4cm/xYdxmCBStzWGwNRndqNY7fwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/bremen3 b/hosts/bremen3 deleted file mode 100644 index 10efae0..0000000 --- a/hosts/bremen3 +++ /dev/null @@ -1,11 +0,0 @@ -Address = vpn03.bremen.freifunk.net -Port = 656 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAr7aAgyRdDjTjJyUhHaPd8aZIybNvi+paDKwkRJFUEHybsSsZs8pl -mJl+wFFn3sW3y6R7th1iVSqHDU85KYpy7CemKcHRo0VVl0OayToKQGUc9wuUkjM2 -XIpZ6WxJ2+B918780dFA5esdeigSTXnKABt80wllLmBumiumj6fGQnzXOFMfyWSI -TlpW77EQqZY3uXGlZjbzmCbzmspbldHZKwUBr1f8GW6pdeMzEeptg/5nVLLu0rG+ -o+rXQuU2GxJXd6OwrIWEzLCpxbRNqZ6Xo2o1U4Mc3vrKv7yQ61xY/hYB7BLU89Dz -tTNXWxy4cm/xYdxmCBStzWGwNRndqNY7fwIDAQAB ------END RSA PUBLIC KEY----- From fa01d2091520a8edfa28602a04a38217f7997922 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Mon, 23 Mar 2015 18:27:14 +0100 Subject: [PATCH 093/132] Add bremen3 (again) --- hosts/bremen3 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/bremen3 diff --git a/hosts/bremen3 b/hosts/bremen3 new file mode 100644 index 0000000..c9c4369 --- /dev/null +++ b/hosts/bremen3 @@ -0,0 +1,11 @@ +Address = vpn03.bremen.freifunk.net +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAxWLy8tG8W3nV3o7fsm/oD+XwFW2qgGNRDRDiTPGmBNrHVGVCH8cI +s2Gpeu226x803dukxmrKXZskLBf5oCWxtI5wrxhkiIrb21RkODrMzQcKvOJ3pOGk +7GekS8WvhxuMAJEKnWiJIS9T3kcGUTMIETSvlWeG/SWkpVr2oFjD87LX+WDCOW/d +arHyu8xH4XpVaDeKwUHlDz3/QQjI4bOa2UvqmebkdkhX/uWd/hNTdpzUYwghPtPx +VNlKqeh+NSibYuep/VSoxFx8UHFu083nB2gNTF+b4apjB/4d2iFUMM/Mpgi+lYQ1 +8ksoTu8C3e8KFhp4oP3GLlRuQ2QY+o4RpQIDAQAB +-----END RSA PUBLIC KEY----- From 5652fb4a35568827fc12aaa5841aaff3a6d78215 Mon Sep 17 00:00:00 2001 From: 020 Wireless Date: Sun, 28 Dec 2014 21:34:14 +0000 Subject: [PATCH 094/132] Adding amsterdam node --- hosts/amsterdam1 | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 hosts/amsterdam1 diff --git a/hosts/amsterdam1 b/hosts/amsterdam1 new file mode 100644 index 0000000..a152aa4 --- /dev/null +++ b/hosts/amsterdam1 @@ -0,0 +1,9 @@ +address = 195.169.146.33 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAuksyHS3OGQUUS7hVItJZGHK/RDeOzuSyqmi7jbVv+0/IfRLU/mt+ +kz/wMz2O/UDxyR84wmrLTVdt8TYnOaFBrlNdMGz3k2HjbZc0UxZpKxHMYR4US6Ab +vLApHSxXK44c16wcWDhQB9yHqM3GdMTdbxuKV60qclulHuI9wHkxDtn1qb1dEkbv +2rF2ldfZnNCZ7ktQ1Pnnkv9lOhT1WK8Ye2Sbl+V7klK7leRfE/eTM5e1KP4Zlf62 +iecoBCzFKCAk3Zw88Sv9IlkVG1ZgO8rdZPH7Bb461XH4W0gO9BANg2/SnW0Hlnyp +Ye2Bh+oGwQTlxjxN44nKOcornozC8kZUuwIDAQAB +-----END RSA PUBLIC KEY----- From 6d59fed131b2bda01f6ae5acb8f517b7502d5449 Mon Sep 17 00:00:00 2001 From: Steffen Date: Tue, 7 Apr 2015 13:42:42 +0200 Subject: [PATCH 095/132] Delete ehingen1 Freifunk Ehingen ist nicht mehr aktiv. --- hosts/ehingen1 | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 hosts/ehingen1 diff --git a/hosts/ehingen1 b/hosts/ehingen1 deleted file mode 100644 index 3c7d3ae..0000000 --- a/hosts/ehingen1 +++ /dev/null @@ -1,11 +0,0 @@ -Address = gw01.freifunk-ehingen.de -Port = 656 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAz1zcs2ZgiZRLVXQyqYXKD3+dx7imqN/cmJ6CYoSfxjesslWaS+qG -29YH+U7qXSDgRyjVtdXdVHIa9dYSKff292H7yzX3LbHPsUEeq5kAAqqieTIsRYoI -6QeUTYkfSuvkqmAe1zUmC5fcf8BRSu2YUHSWhM5Lu9ulWzXuKYoipnXgqQzVz67w -3DnYEx/DEAxn4LKagOpUq+l9OzChOtMWeW1/MSCaEhm7VLYaY9YITdhb5U61PB7F -fdv/77AhRBjL6zfNX6M9ZookKukAz3KHme5EzDYXVA4CiyBN+HMzgCYHbqopOiVZ -BGjNAeO8FjAkBwn5Os608LOSocOEVz9KDwIDAQAB ------END RSA PUBLIC KEY----- From b890378640c797c42e9c394c52692220122f8fb1 Mon Sep 17 00:00:00 2001 From: dracoTrier Date: Sat, 11 Apr 2015 01:15:04 +0200 Subject: [PATCH 096/132] Add trier2 --- hosts/trier2 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/trier2 diff --git a/hosts/trier2 b/hosts/trier2 new file mode 100644 index 0000000..7cd10b5 --- /dev/null +++ b/hosts/trier2 @@ -0,0 +1,10 @@ +Address = gw2.freifunk-trier.starletp9.de +Port = 655 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAu5IiDnY5Ix54b0fb6HqXM5GggH9TQCPTXqUnKgurPkiOHr+OcMSB +6LlE3v0N2HJYS+UJmjHZtNd9z4SdhQoft6t1vEM48G9gi0HDJoLvi+ZnEHbW0LdP +PE5H2gwEzrZ6YAtbFiyM55dVY/5G3fYEF7nrB1ItAkqujUfWoLSVE1q08Gt/MbnK +7X5rnr8JWquuj2vcn4KBn4YHuLBMNCotNINzDOECqst3CZLUioKoxQenhpyX/ZP0 +A0RNqpf6msFMiRY5+qEhXQYqP7ztc9MaLb5+7dvSePkjR4tEvBEizV5Qxxzpb6FA +ZnOEZT5UV+Pgx8iyBuyXnHeDB4X4F3gbLwIDAQAB +-----END RSA PUBLIC KEY----- From 0dc1fc7be3b9bd764149aa89618d51d94bebe8fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Apr 2015 02:35:52 +0200 Subject: [PATCH 097/132] post-merge: allow case-insensitive address parameter in host config --- scripts/post-merge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/post-merge b/scripts/post-merge index 7adba43..1e77b4e 100755 --- a/scripts/post-merge +++ b/scripts/post-merge @@ -20,7 +20,7 @@ sed -i '/^ConnectTo/d' $TINCCFG for HOST in hosts/*; do # skip hosts without address - grep -q '^Address' -- "$HOST" || continue + grep -iq '^Address' -- "$HOST" || continue echo "ConnectTo = ${HOST##*/}" >> $TINCCFG done From c455a29485e527546e4a26bd0c85cce7759cd24c Mon Sep 17 00:00:00 2001 From: joerg-d Date: Thu, 16 Apr 2015 08:38:22 +0200 Subject: [PATCH 098/132] Create gw1 of gera-greiz --- hosts/gera_greiz1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/gera_greiz1 diff --git a/hosts/gera_greiz1 b/hosts/gera_greiz1 new file mode 100644 index 0000000..cb4c04e --- /dev/null +++ b/hosts/gera_greiz1 @@ -0,0 +1,11 @@ +Address = gw1.freifunk-gera-greiz.de +Port = 10781 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEArLhMleQyfCgADO1vPEHK1hTJ8ZW/NljeiFsZcvTHCRKnnfF0AP1S +XfcviGlQCV3sfhXLdKABe0QZiLeHwbJY2R/n0PJxG/UxfscAKH+vRCa6qA4PqVI7 +CLShMe+E/S66UPvYzYYwBpfLBFYlaMzSz+IhvhiRwoCWgk/0+YfPJt85mFSUHNxN +XGiBLJBSRGnGi9BFSw+GbrN86lmknV/fnL4uypFw94TJYF0Q7TexgP7aRtFSOciH +2tDCbzzJh7lmw4XE1Wtz7QWUP/R34zqlOELXlmoilbkTO71y4qlCeTHmaWDOG9/f +VScV3K/v1mrofNlK35GJzfcOp9ueijIbZwIDAQAB +-----END RSA PUBLIC KEY----- From e3247d7cb5862d73ccd0aff51d859ee9b5032443 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Apr 2015 16:34:39 +0200 Subject: [PATCH 099/132] Introduce the concept of metanodes updates the README file, and makes the post-merge script read the metanodes file instead of the whole hosts/ directory. --- README.md | 66 ++++++++++++++++++++++++++++++++++++++++++++-- metanodes | 4 +++ scripts/post-merge | 8 +++--- 3 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 metanodes diff --git a/README.md b/README.md index 0929bc1..71de455 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,68 @@ [![Build Status](https://travis-ci.org/freifunk/icvpn.svg?branch=master)](https://travis-ci.org/freifunk/icvpn) -This repository holds IC-VPN keys and configuration. +This repository contains the tinc hosts for ICVPN-Peers and several helper scripts. + +## Setup + +This network requires the use of the Tinc VPN Daemon. You should use at least version 1.0.24 or higher, als the +current pre-release version 1.1pre11 seems to work just fine. + +### Clone the repository + cd /etc/tinc/ + git clone https://github.com/freifunk/icvpn.git + cd icvpn + cp scripts/post-merge .git/hooks/ + +### Create your tinc configuration + +Open your favorite editor and create the /etc/tinc/icvpn/tinc.conf. + Name=entenhausen1 + Mode=switch +More options can be found through + man tinc.conf +Afterwards create a keypair with tincd. + tincd -n icvpn -K +Hint: In version 1.1 this option was moved to the tinc binary and is called generate-rsa-keys. + +### Execute post-merge hook + +This step is necessary to populate your new configuration with infos about the metanodes. + ./git/hooks/post-merge + +### Set up a cronjob to update the repository in regular intervals. + + @daily cd /etc/tinc/icvpn/; git pull > /dev/null + +## What are meta nodes? + +Tinc has a ConnectTo configuration option that describes which peers on startup to connect *and* sync metadata to. + +Until now (2015/4) we had roughly 74 nodes, and every node connected to each other (full mesh). Tinc however +does not scale this way, because on each connect and disconnect all ConnectTo-lines are being notified of this +and then notify their neighbours again. Many smaller nodes seemingly could not handle the amount of metadata generated +by this which resulted in TCP Zero Windows. They then disconnected, and reconnected, producing more metadata in +the process, which was followed by even larger nodes queueing up metadata, which resulted in all nodes taking +a massive cpu and memory hit. Memory usage of up to 1.5GB was spotted, accumulated in less than 12 hours. + +However for tinc to build its network graph it is sufficient, if all nodes only exchange metadata at a few nodes, +which results in much less strain on the whole network. This is why we now use meta nodes, which are defined in +the `./metanodes` file. + +Criteria for the selection of meta nodes are: +1) autonomous system diversity +2) community diversity +3) ample resources (cpu, memory, traffic) + +When data needs to be transferd between two nodes, this will happen indepently of those meta nodes. Through the shared +network graph a direct transfer is possible and will be tried: at first via UDP, then via TCP, then indirectly. While +indirect routing is possible the meta nodes are not required to provide forwarding for those packets. + +## Contact + +The maintainers can be reached at +- [icvpn@lists.funkfeuer.at](mailto:icvpn@lists.funkfeuer.at) +- [irc.hackint.org #icvpn](irc://irc.hackint.org/icvpn) + +We have set up IRC notifications for all repositories concerning the icvpn network. -For more Info see http://wiki.freifunk.net/IC-VPN diff --git a/metanodes b/metanodes new file mode 100644 index 0000000..5adfa0f --- /dev/null +++ b/metanodes @@ -0,0 +1,4 @@ +berlin2 +darmstadt2 +luebeck2 +trier1 diff --git a/scripts/post-merge b/scripts/post-merge index 1e77b4e..b70396a 100755 --- a/scripts/post-merge +++ b/scripts/post-merge @@ -18,12 +18,12 @@ test -w $TINCCFG || fail "ERR: $TINCCFG is not writeable" sed -i '/^ConnectTo/d' $TINCCFG -for HOST in hosts/*; do +while read HOST; do # skip hosts without address - grep -iq '^Address' -- "$HOST" || continue + grep -iq '^Address' -- hosts/"$HOST" || continue - echo "ConnectTo = ${HOST##*/}" >> $TINCCFG -done + echo "ConnectTo = $HOST" >> $TINCCFG +done < metanodes /usr/sbin/invoke-rc.d tinc reload icvpn From 51582c31858f543baf74b8472463d052501c83cc Mon Sep 17 00:00:00 2001 From: hexa- Date: Sat, 18 Apr 2015 16:43:09 +0200 Subject: [PATCH 100/132] README.md: fix formatting --- README.md | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 71de455..7849425 100644 --- a/README.md +++ b/README.md @@ -4,33 +4,39 @@ This repository contains the tinc hosts for ICVPN-Peers and several helper scrip ## Setup -This network requires the use of the Tinc VPN Daemon. You should use at least version 1.0.24 or higher, als the +This network requires the use of the Tinc VPN Daemon. You should use at least version 1.0.24 or higher, also the current pre-release version 1.1pre11 seems to work just fine. ### Clone the repository - cd /etc/tinc/ - git clone https://github.com/freifunk/icvpn.git - cd icvpn - cp scripts/post-merge .git/hooks/ + # cd /etc/tinc/ + # git clone https://github.com/freifunk/icvpn.git + # cd icvpn + # cp scripts/post-merge .git/hooks/ ### Create your tinc configuration Open your favorite editor and create the /etc/tinc/icvpn/tinc.conf. + Name=entenhausen1 Mode=switch More options can be found through - man tinc.conf + + # man tinc.conf Afterwards create a keypair with tincd. - tincd -n icvpn -K + + # tincd -n icvpn -K Hint: In version 1.1 this option was moved to the tinc binary and is called generate-rsa-keys. ### Execute post-merge hook - This step is necessary to populate your new configuration with infos about the metanodes. - ./git/hooks/post-merge + + # ./git/hooks/post-merge ### Set up a cronjob to update the repository in regular intervals. + # crontab -e +and insert for example + @daily cd /etc/tinc/icvpn/; git pull > /dev/null ## What are meta nodes? @@ -49,9 +55,10 @@ which results in much less strain on the whole network. This is why we now use m the `./metanodes` file. Criteria for the selection of meta nodes are: -1) autonomous system diversity -2) community diversity -3) ample resources (cpu, memory, traffic) + +1. autonomous system diversity +2. community diversity +3. ample resources (cpu, memory, traffic) When data needs to be transferd between two nodes, this will happen indepently of those meta nodes. Through the shared network graph a direct transfer is possible and will be tried: at first via UDP, then via TCP, then indirectly. While From 98d313a675e36e00afcb389f4730baeb67bee983 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Apr 2015 16:57:24 +0200 Subject: [PATCH 101/132] darmstadt: reenable dual-stack with tinc1.1 --- hosts/darmstadt2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/darmstadt2 b/hosts/darmstadt2 index c854b1b..535dcf9 100644 --- a/hosts/darmstadt2 +++ b/hosts/darmstadt2 @@ -1,4 +1,4 @@ -Address = ip4.gw04.darmstadt.freifunk.net +Address = gw04.darmstadt.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAuohUruR8enzVN1IswdzMuf8f3rY2HOK/yByItBcMHM9b4HMe6Jt6 From 5f3104f10b8e4beab0488ed813dfbb4616c31127 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Mon, 20 Apr 2015 09:29:01 +0200 Subject: [PATCH 102/132] hamburg: remove Port= lines, make hamburg02 reachable again --- hosts/hamburg01 | 1 - hosts/hamburg02 | 3 +-- hosts/hamburg03 | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hosts/hamburg01 b/hosts/hamburg01 index 4e6e83d..f339aa0 100644 --- a/hosts/hamburg01 +++ b/hosts/hamburg01 @@ -1,5 +1,4 @@ Address = 01.icvpn.hamburg.freifunk.net -Port = 656 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA3IbMWLjnM3S4HsFfKvhJdg9TYRPnzxRyL2CaL5KtcCTu8mMMOeCX diff --git a/hosts/hamburg02 b/hosts/hamburg02 index b282957..bbbad9d 100644 --- a/hosts/hamburg02 +++ b/hosts/hamburg02 @@ -1,5 +1,4 @@ -# Address = 02.icvpn.hamburg.freifunk.net -# Port = 656 +Address = 02.icvpn.hamburg.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEApyg+KLP9XfIwOIgBHjbGgt0l5ve+/O1Mec3ed/d0q6Bh+oTkJxOn diff --git a/hosts/hamburg03 b/hosts/hamburg03 index 854bc9d..36fe0e5 100644 --- a/hosts/hamburg03 +++ b/hosts/hamburg03 @@ -1,5 +1,4 @@ Address = 03.icvpn.hamburg.freifunk.net -Port = 656 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEApitk4y7bZ8yI5U7pY87C8OdHMiYMQbMfd8KmttVhCFHaXgpbp6L5 From 78695a245e24e11d5460974792b2fec8e0cad030 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Mon, 20 Apr 2015 09:31:16 +0200 Subject: [PATCH 103/132] metanodes: add hamburg03 as discussed --- metanodes | 1 + 1 file changed, 1 insertion(+) diff --git a/metanodes b/metanodes index 5adfa0f..522ea7f 100644 --- a/metanodes +++ b/metanodes @@ -2,3 +2,4 @@ berlin2 darmstadt2 luebeck2 trier1 +hamburg03 From 8088eadc9c1bf7274a720eedf7ce989a4d794a00 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 23 Apr 2015 22:44:40 +0200 Subject: [PATCH 104/132] darmstadt: reenable dual-stack for darmstadt1 --- hosts/darmstadt1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/darmstadt1 b/hosts/darmstadt1 index 813f3c5..f843846 100644 --- a/hosts/darmstadt1 +++ b/hosts/darmstadt1 @@ -1,4 +1,4 @@ -Address = ip4.gw03.darmstadt.freifunk.net +Address = gw03.darmstadt.freifunk.net -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAsFBR3wzdRoFXDy38HQtlYDKHvsbY99fUkPZXxg5v3dBGIfWDWMBR From f1f82e67c2192b37eb911bd6ab88ff68bdc6501f Mon Sep 17 00:00:00 2001 From: Philipp Hirsch Date: Tue, 28 Apr 2015 10:44:22 +0200 Subject: [PATCH 105/132] Add host kassel3 --- hosts/kassel3 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/kassel3 diff --git a/hosts/kassel3 b/hosts/kassel3 new file mode 100644 index 0000000..56694e6 --- /dev/null +++ b/hosts/kassel3 @@ -0,0 +1,11 @@ +Address = vpn3.ffks.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1GDz1qNLj4EVXc07Zg+KXqIsgL+cyacxJsqt8yklQVeY5s8/jeKn +UFQQb91TGrWKEqGWUyeFDPYOqTsHWQO0VDspidkeBP+6ijlPxnlaf9cO5ZR/Xjv1 +n2ndcEkTzRNUTpHhHBG9iQtVYUH1O9j0n4rBAVnF1o6IWVrYgAgusMnKd6W8NJ5K +IGepgRZRi3gIjOQj/YqKPma/vZC7gBkksSpNf2dXusUSisztb7lfhGJgaAP5Fg5d +vr0Jrd9NEDiy5TgH1oMpQcpCCAOSvEdhhbb6XPRCZIb+WCobV06GeV7vhmIl0tKe +IRL/y2Fgm2QO+JNr7jvoa1LxrZYvWCXIywIDAQAB +-----END RSA PUBLIC KEY----- From e107531586218bc3c446f95c8e36e7082ae335ca Mon Sep 17 00:00:00 2001 From: Philipp Hirsch Date: Tue, 28 Apr 2015 11:27:05 +0200 Subject: [PATCH 106/132] add host kassel1 --- hosts/kassel1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/kassel1 diff --git a/hosts/kassel1 b/hosts/kassel1 new file mode 100644 index 0000000..66e34c7 --- /dev/null +++ b/hosts/kassel1 @@ -0,0 +1,11 @@ +Address = vpn1.ffks.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvKiRJR1BTj2pGVEhJJCQPs15gz85eyfB10mMB9yJ+5fA4OyeJnMs +ZRAWtG1/ViTDG2a6rt1oF/k7KuWIuhC+aQTI4quniBV6Tk+7kJg/BgW0nPpn7H8n +wpSxF91kq1HGiMmZs9jF1Am/5cIdUeA437ZX/W5qN/L2h5mGzw4wTLLH6GD/D0p0 +cEkyTVaXhlswOx0xj8T2/Ugzk8wK4QACa1ZwfVFMuuB3HsBmXOMAH4fEyogdlTSv +INNhZ2gLT1B4XbKbDwJ+MrOOMz3XbqvaGTHW1I5Jo0y98Ckwqis20eWg0BljgdCM +2PFkFNWCkf14Wc4EpRS4+eGXj/a7v4s7nQIDAQAB +-----END RSA PUBLIC KEY----- From 69910ab0e480d3e2ae2fe541b7490c1cc750a311 Mon Sep 17 00:00:00 2001 From: Stefan Rauscher Date: Thu, 7 May 2015 14:45:11 +0200 Subject: [PATCH 107/132] Add host dreilaendereck4 --- hosts/dreilaendereck4 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/dreilaendereck4 diff --git a/hosts/dreilaendereck4 b/hosts/dreilaendereck4 new file mode 100644 index 0000000..5790296 --- /dev/null +++ b/hosts/dreilaendereck4 @@ -0,0 +1,11 @@ +Address = gw4.freifunk-3laendereck.net +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA6ijzZkaqqEHOazFRzCPesuCTUCAtgVa3JrBm2R5cb2rLuDQDmqQm +O8zqlj3rM8cBRGexRz/2F9FNxQcEhfPmowiigGlDXW6rzcFDWeGl7w4rn75rP3a+ +gfmbSOmRLG/dvghDRceDEbr6MU7DlCOgHjaz+WdHmJWR0gnlnQJLqMa1RgPN24GK +orq8h158645pDbX/wJCNdBB81X4kgJOjWJF+ic2qbF0iuUKt1689QJnn6Mo+9T5y +K+xt9c5XlgqqD4UxP4JF66ctoN8aBscPFOEZfUjujNqvKhCWbhal13EHM9dCEnQA +1Myf7sRdaLvMpKsvSESMfl588I/XulszMwIDAQAB +-----END RSA PUBLIC KEY----- From 94fbbefb0b2f6dab25a298c580a84ba21ec27992 Mon Sep 17 00:00:00 2001 From: Christian Bricart Date: Mon, 11 May 2015 14:36:16 +0200 Subject: [PATCH 108/132] add host aachen1 --- hosts/aachen1 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/aachen1 diff --git a/hosts/aachen1 b/hosts/aachen1 new file mode 100644 index 0000000..3839a42 --- /dev/null +++ b/hosts/aachen1 @@ -0,0 +1,10 @@ +Address = icvpn.freifunk-aachen.de +Port = 1655 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAoGeD5b1HKW2UAFpIPayxsOOYx5qC0oHrJnvcPH33jnDBGiOYJ9ma +QZErWdF0Qsnqh/wJE6i569fzKWOUdLHrN5dVzD/Q5zjMOwJf3rmcerS0oAFTxKDj +pkw2kKcLA/lSNMIN//W66mM258BLo1XgEraUx5RcJ4hTxawhNTn0NTJVCbfUX6e5 +tcJpbgbYRzBTUPdSL3OB8k0qlmFI2ZYTnCzOSpgxRQARIB1ecoqOYVxQISK2pzxi +MHQQlVbquwldaKiVoj7tD7PFW4oQxpiMHZnHIA6dnZCsT3ktTOzCjhf2XMi8o8u5 +P9C5dYrmVWrVAWQznlbuq/w1z+PrTYquoQIDAQAB +-----END RSA PUBLIC KEY----- From f46ef57b5e51b5361ab8b56b938ef3b4575f401b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 11 May 2015 15:15:14 +0200 Subject: [PATCH 109/132] post-merge: prefer the tinc1.1 cli over invoke-rc.d if it exists --- scripts/post-merge | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/post-merge b/scripts/post-merge index b70396a..f7880de 100755 --- a/scripts/post-merge +++ b/scripts/post-merge @@ -7,6 +7,8 @@ # 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/" # +PATH=/usr/sbin:$PATH + fail() { echo "$1" >&2 exit 1 @@ -25,6 +27,11 @@ while read HOST; do echo "ConnectTo = $HOST" >> $TINCCFG done < metanodes -/usr/sbin/invoke-rc.d tinc reload icvpn +if hash tinc; then + # prefer the command line interface that comes with tinc1.1 if it exists + tinc -n icvpn reload +else + invoke-rc.d tinc reload icvpn +fi exit 0 From b78523fb0789723eef07f670fcd5c17737d731e2 Mon Sep 17 00:00:00 2001 From: Christian Bricart Date: Mon, 11 May 2015 18:40:34 +0200 Subject: [PATCH 110/132] it is icvpn.NODES.freifunk-aachen.de .. fscking Wildcard DNS.. --- hosts/aachen1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/aachen1 b/hosts/aachen1 index 3839a42..422c043 100644 --- a/hosts/aachen1 +++ b/hosts/aachen1 @@ -1,4 +1,4 @@ -Address = icvpn.freifunk-aachen.de +Address = icvpn.nodes.freifunk-aachen.de Port = 1655 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAoGeD5b1HKW2UAFpIPayxsOOYx5qC0oHrJnvcPH33jnDBGiOYJ9ma From e9383fcbe56063bb7534cf3b18686315a293263f Mon Sep 17 00:00:00 2001 From: olliff Date: Fri, 15 May 2015 06:24:33 +0200 Subject: [PATCH 111/132] local community freifunk westkueste added --- hosts/westkueste1 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/westkueste1 diff --git a/hosts/westkueste1 b/hosts/westkueste1 new file mode 100644 index 0000000..92ec42a --- /dev/null +++ b/hosts/westkueste1 @@ -0,0 +1,10 @@ +Address = 01.icvpn.freifunk-westkueste.de + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvpWNaR4X4arH41BS0LNSnMIWDJAfByhJR6w5W3lAgAUKK0V2nVa0 +KRIEIWOMXgahbCwEPZHn/F+N4JA4H8/oMjseevfBipkBkGekRUAI6OXSLU1h+Vha +Q1BrHHo0rzM81WcNJoV5XjEHSZ+3PK6HY0Tbw3K4wAo0HKAft+hDCYAdwZXm+dAi +ExfwRp06FRNoiLSUD1JSnRIji+PJFJh7ZmulDNANd4+gBsAqQdkf7tCG05rjor/v +XCJlLQKPbil+cxC1t+vrz4x02h27v7bBDgs5+joAmRsnpCnDT8YERhf+yQw5xJcw +XtEVvM0ZeRhmVfFECY9lz4LSBlXVvyn8SwIDAQAB +-----END RSA PUBLIC KEY----- From c3a61f8fbcfbbdf6a22d046a59b2e9b8e7c3d8e1 Mon Sep 17 00:00:00 2001 From: Ronny Trommer Date: Fri, 15 May 2015 21:03:12 +0200 Subject: [PATCH 112/132] FFFD: Added fulda1 tinc VPN - Added tinc gw03.freifunk-fulda.de VPN endpoint --- hosts/fulda1 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/fulda1 diff --git a/hosts/fulda1 b/hosts/fulda1 new file mode 100644 index 0000000..d9358ee --- /dev/null +++ b/hosts/fulda1 @@ -0,0 +1,15 @@ +Address = gw03.freifunk-fulda.de + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAw97CxdW9jjI6gHExRsls5rCJ9mt2FW4jLg6AiUAlcKo6gJkAK7dn +TK72ckMBoFc0oQTqOAMtdxPGdkojqy9jfOGRnJrEPru8zfHaL2AHEy3BO8DTdt6P +43UB5dxymfEcaLi/5lMyjuwX1AwnWZwh3yHhUjjSIRo2f8Ph6iiVWOOCcTTv4YGb +8ODSNjtsmDtAv9Ejj4+GJaMAtKn2KP0u73C2ix169nUtfIdRN9OCx50ZHig8GVqZ +LwWK0zDpOStlgNaBhCne8LO8yHnMyimrNIBRORNFR04YtUt0ubiZqjLm14wFLe0t +zJqqquOXA7Es2ztvX5PP+xhyPv9N8hd5t4kg/2OExkZZ4JVN8Npb1bNQurEon38a +RFnbKSKXxrN2UGwJLKrJa3GkXCrFVn1M+/XnQkT2VjkaPYjOPDNr6j2oUj07/mAS +Xs74TBDIk+Re1xmUsuehzBd9CfhnWJCc/JOgZuLeWThm0RccOCFFRBLz92QFzVnZ +NXVGTLktNMGnMdDZ0EjLoXQzWQRJEJ4gSeQRfsFYFvMk9qPwRoXB1pMHSckNoSxK +4Bfwl+md6eF9g74aGQ0JrhO+mpUcSrEWbh0w4W4jhU7UuTxxAwKrHBYt77012QrQ +g0L07Z1lY4DB1FWXkkJ7VWI0rUJpCzUKJH34kQGhJ771Rwq0TGAli70CAwEAAQ== +-----END RSA PUBLIC KEY----- From 0f0eeac818937c27cb099d84e332515299722a20 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld Date: Fri, 15 May 2015 21:17:42 +0200 Subject: [PATCH 113/132] =?UTF-8?q?Neuer=20Host=20Freifunk=20M=C3=BCnsterl?= =?UTF-8?q?and?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/muensterlandFK | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/muensterlandFK diff --git a/hosts/muensterlandFK b/hosts/muensterlandFK new file mode 100644 index 0000000..aad6fef --- /dev/null +++ b/hosts/muensterlandFK @@ -0,0 +1,10 @@ +Address = 37.120.168.53 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvPXymyzB4wGKvoCteVEABNx8sSxH+zWUbpvr/UmGqfvR/kc1tgEq +cEhygHxJOQ3yzO/YdNxYE3SBBl2IuyUw+mpvxPv0CMZheYlJPevWrdRpXI7/kWvU +4ZXKys5ImG/OWmRyeliiyQo/CuCGqctATlV4bzlFnZxObRTfSw1+DY0sfZM43wvA +v03Pd+Q0il6wSvH+60YTALoCSzXzvegr9QmszUEQr+HQwcZuPapNqkeZV8L7HpCb +1uKpTpBZaAqLKItgAo5dl19pXe8kWfw1i3HHMYgW1LRHAbdCVUquMJhi1IY1eOX7 +5lp28qZFWPotB02NOLeDLFMkMd/P4emaDQIDAQAB +-----END RSA PUBLIC KEY----- From 02c53cf69606fb09b54b33c42b97b80a334bf936 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld Date: Fri, 15 May 2015 22:53:41 +0200 Subject: [PATCH 114/132] eintrag mit hostname --- hosts/muensterlandFK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/muensterlandFK b/hosts/muensterlandFK index aad6fef..e243dda 100644 --- a/hosts/muensterlandFK +++ b/hosts/muensterlandFK @@ -1,4 +1,4 @@ -Address = 37.120.168.53 +Address = fusselkater.gw.freifunk-muenster.de -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAvPXymyzB4wGKvoCteVEABNx8sSxH+zWUbpvr/UmGqfvR/kc1tgEq From 7b563eccd44046c25c1b4bb191d99d0d479d32bb Mon Sep 17 00:00:00 2001 From: "@RubenKelevra" Date: Wed, 20 May 2015 21:10:01 +0200 Subject: [PATCH 115/132] add nrw1 --- hosts/nrw1 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hosts/nrw1 diff --git a/hosts/nrw1 b/hosts/nrw1 new file mode 100644 index 0000000..da23a64 --- /dev/null +++ b/hosts/nrw1 @@ -0,0 +1,15 @@ +Address = rig.vfn-nrw.de + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAwPiIGCFsBFWSo7UZZkLhH22D7g6QbXzrLtTWcMAvYYNIGCmS7G94 +aGwQ20ccrUeAtLt+P6y1+TPinOndnIPQND5kxnV4d18PCCrj1ipz0B/hUH0c47K3 +JVu1X7n1CxZwSHQ3/EHSGDEb4Q6K8vIVwmGE9WL8tCALgmBB9PzLwrLNkJDjv6ky +4Jmb3JftPvBNwjlNXbRBDh7Pqpnp/9N+/TkdK35KHpThBHNNdkUozKr9+8FzXcph +foC9nbArlXuJTSQVLvjfj03eFCE/Cc0iFCJDnFXtxnFNsLHohCbEi1epzYStNiCh +/urOJyiCVIVtZ2hnUUuh3TKjHITUbF3QRtwp7cu6DrAqWmAG/sEjlsnby56AXeIn +HZPFMswzV/cHAli+lkVL6kRx9/WWA8yEJaM1T4l/j74lORQJmgcTuuAv8rzSy8Qm +5MwRiWn31CaSLTmYp6Sw43r8wurEX1Bvmbbd8845LGpfXjaNJ2mzEETdNd72R6GG +1kTDZBYOMZ9Ty6BDLSgU1EiijCAvI1J8rnXxLb+3ttMXnixlQgg8XiZNC2L0PvL4 +VVtaZBElIBXFbLs9LLPWq4/HDviUEdz0+5f5W0MtjrikJ1DwZYyUZKC/fBXHvw/p +gKeW1YG/1E4K70JDdSxRKvaq2n+LFfvRmGWG0SM0jmqElUc0vopfOh0CAwEAAQ== +-----END RSA PUBLIC KEY----- From c8790b51d77cc96ed8b4440b335d0daa53f3c596 Mon Sep 17 00:00:00 2001 From: "@RubenKelevra" Date: Wed, 20 May 2015 21:10:45 +0200 Subject: [PATCH 116/132] update nrw2 address --- hosts/nrw2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nrw2 b/hosts/nrw2 index ff8aae8..589d275 100644 --- a/hosts/nrw2 +++ b/hosts/nrw2 @@ -1,4 +1,4 @@ -Address = bragi.wk.freifunk.net +Address = bragi.vfn-nrw.de -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA2i89suXrS03mxdWvdmtMH0F3ZSJ7xrkwzpVgEJvYqNCbWCBPKaLF From 6c49915b3679055bdbee75bfcab41fc4fe5477d0 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 20 May 2015 23:49:09 +0200 Subject: [PATCH 117/132] Added Server Adress for Troisdorf1 --- hosts/troisdorf1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 hosts/troisdorf1 diff --git a/hosts/troisdorf1 b/hosts/troisdorf1 new file mode 100644 index 0000000..485de4a --- /dev/null +++ b/hosts/troisdorf1 @@ -0,0 +1,11 @@ +Address = gateway2.freifunk-troisdorf.de +Port = 656 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA158/RHkey6Sess08Koxrt3rKUJ1jhzb5cyMEJ7oTG3f+Qv/EMdn3 +aiL3PIPtcq3BA5Lse6Q3ddJOKw1Ejm7gfMiZFzP7GvetDHO0PssdyFwVmA4SugaO +4W6N/y9uOCGOF4zmLULq1Sv+q1WH3hVCkSjjn2rH0rISrCjz8cfiM4wsxpU/0sDU +cYykyHo7j4GC9QI/ECHdiFSZXJ93N9Lp9iRI9lHV8y8Sfh1AmCJmwKE3t0DBVVTi +HwneSxJpuTklvOriLHSxMAn/V7ZFvV/TSQR7xdXkgXZJhJUftlefxcUBwuGn+XQj +Uhpx5m8cQYswVoaIr9cVjmG4QDuoJbnoUQIDAQAB +-----END RSA PUBLIC KEY----- From abbc54eeb712d13f3cdfa09c203a8f6bd6033790 Mon Sep 17 00:00:00 2001 From: bodems Date: Thu, 21 May 2015 17:50:37 +0000 Subject: [PATCH 118/132] removed bielefeld4 --- hosts/bielefeld4 | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 hosts/bielefeld4 diff --git a/hosts/bielefeld4 b/hosts/bielefeld4 deleted file mode 100644 index 1a60112..0000000 --- a/hosts/bielefeld4 +++ /dev/null @@ -1,12 +0,0 @@ -Address = vpn4.freifunk-bielefeld.de -Port = 655 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAvOJHnI0VCn4ZOVitzitHPHpxHesW4TYf7QafYU6ClQy/Sy9WN5Eg -lrfszpwZmzABnJZ7T7BQN8j91neKwzj10qr6ppLCDavP0nqQ0CJ+Bg7SCc6HJbsQ -aDTU1lvNcGKKPD+KchSNxUkOBZjZavVw01taztEnYy6hUy/ml8vdLTUjBBPMUQ0+ -rTe5m/rjPim5J4Eo56kRoJ2TQ3bRNZwTAgV07NAosO5V1qUncPoYsMmS6RrbBVxj -q7UOEyegBrsFF0F5tdK/itvZIWD2T/0DlDUqoPmfh2j+urbzYwAw9VBc1+4DByfS -Unn0cQ8AccXTDtMWQVOrLxIhm0JCmiDi6wIDAQAB ------END RSA PUBLIC KEY----- - From e0daaa7f4176d5ae06a9f228be2fb4cb9d3a578d Mon Sep 17 00:00:00 2001 From: bodems Date: Thu, 21 May 2015 17:50:54 +0000 Subject: [PATCH 119/132] added bielefeld6 --- hosts/bielefeld6 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 hosts/bielefeld6 diff --git a/hosts/bielefeld6 b/hosts/bielefeld6 new file mode 100644 index 0000000..e56f24c --- /dev/null +++ b/hosts/bielefeld6 @@ -0,0 +1,12 @@ +Address = vpn6.freifunk-bielefeld.de +Port = 655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwzVXJJ1/BjwV4SgXxfCJ1xpYp7mrioNBbCk9ea+J5oZs79GM3Jqo +BHuW8QxL/x75OskFAHAlVrlLGZzoE6RtlvzIqiKesVcOuSskyt0E7r+wqltSxu4N +tbyDRVUOkAHTwQ0zEPMPy1HJhD8SmA3m4oHPjGYdAAQztrKB2CSnP/2P29lxllLr +OPcQt6/UN1/OcbuzHnrPSOFGxyb4Ir2FRWxiCRGjqI3QQ/ci2wfEnKsqaG/OH5nr +gojUGkx6XT9L5Rp5cP+Xdiwr+k7J6Snnx7ZEdpdVW43sfzjJinrR1Kp4w+NgE3XS +FFevHmSj5pMO+YHYucDKepreqSgHqwexvQIDAQAB +-----END RSA PUBLIC KEY----- + From 6e1a4677b1ffedb473d0f307b5d2f41e3f13e6b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 22 May 2015 18:29:54 +0200 Subject: [PATCH 120/132] remove diac24 --- hosts/diac24_sbc | 6 ------ hosts/diac24_sbz | 6 ------ 2 files changed, 12 deletions(-) delete mode 100644 hosts/diac24_sbc delete mode 100644 hosts/diac24_sbz diff --git a/hosts/diac24_sbc b/hosts/diac24_sbc deleted file mode 100644 index 0c0fdae..0000000 --- a/hosts/diac24_sbc +++ /dev/null @@ -1,6 +0,0 @@ -Address = sbz.icvpn.diac24.net ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAN8O1i0kkDsktLuFbL01x/Mj47KtTMQUm373NthJoYeuxh7Uc8eud0E3 -FoZBcMCn7LKRvLh8HH83re+SAeplZ5nFqYLBEIZtonhRlP+bnIQDjGCwTaXXp2ew -m8ZAPA1TPRl6e3ZzJw7CvGZrsiKfwwNUaEp/AIrdJ3p55fUehiFNAgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/hosts/diac24_sbz b/hosts/diac24_sbz deleted file mode 100644 index 0c0fdae..0000000 --- a/hosts/diac24_sbz +++ /dev/null @@ -1,6 +0,0 @@ -Address = sbz.icvpn.diac24.net ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAN8O1i0kkDsktLuFbL01x/Mj47KtTMQUm373NthJoYeuxh7Uc8eud0E3 -FoZBcMCn7LKRvLh8HH83re+SAeplZ5nFqYLBEIZtonhRlP+bnIQDjGCwTaXXp2ew -m8ZAPA1TPRl6e3ZzJw7CvGZrsiKfwwNUaEp/AIrdJ3p55fUehiFNAgMBAAE= ------END RSA PUBLIC KEY----- From 66cccc539526871b558d7a513244f29d2e97a529 Mon Sep 17 00:00:00 2001 From: Freifunk Harz Date: Sat, 23 May 2015 13:29:23 +0200 Subject: [PATCH 121/132] Add first gateway for Freifunk Harz --- hosts/harz1 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 hosts/harz1 diff --git a/hosts/harz1 b/hosts/harz1 new file mode 100644 index 0000000..a221d5c --- /dev/null +++ b/hosts/harz1 @@ -0,0 +1,12 @@ +Address = 88.198.40.100 +Port = 656 + + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA85ZQazOKLgIsyh8ajrcq6OTxU3TAT11L5Sz7gGMwtQxBQAGNHw7E +V7vbS4TjWzOkiNzPC84GWkGOSsnaf6qLFT2ELoOFfTSPojNLKI9h5vENwkCX/aha +B/wnPnVesp/K+ihPOWHfEAb1Kuu3gYsi3Xq4Bv+5dPl7aW13+aHjgCCHRDZ3eKRo +eDfk0mDhQAtUPhfQG5uH/PGiv4dE+e/NQx59ame3YmQGaos4mfjhkZ+3r/Xa2qZF +TvVd/7eGMzyvuNgnh/ygaGyTy3OLbDhxR68aunr/CYY/ekbO/whcEhuVjiYYa4Qw +wrW/zBmZxyWfW6SCXXt+Z5xG0vDcuIrzBwIDAQAB +-----END RSA PUBLIC KEY----- From 4e2a0284f70b9b0b8efdeee04976e87213af97ef Mon Sep 17 00:00:00 2001 From: srauscher Date: Sun, 24 May 2015 14:55:54 +0200 Subject: [PATCH 122/132] Remove dreilaendereck3 --- hosts/dreilaendereck3 | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 hosts/dreilaendereck3 diff --git a/hosts/dreilaendereck3 b/hosts/dreilaendereck3 deleted file mode 100644 index bf28c61..0000000 --- a/hosts/dreilaendereck3 +++ /dev/null @@ -1,11 +0,0 @@ -Address = gw3.freifunk-3laendereck.de -Port = 656 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAriAC3ChanNKtXgp/Eu0EcTJTeAM8yp1D35SOM89hVgygYmy4woC0 -CEx6SbVFnwzL4Rar4+c4XXCDLq74AsHjTe7ulzvSDJ/acSoOVsXZ0Wnb5QUFYDlL -ue/2dp9TNHNRl/27OjBL+5fQM4LBvdImBJFKxuYtJc5ApB12LAIAx2y5FS0mp2rT -k2+HDZgaxanlUf6ecaFp8H7A5LiITig8nHUa9/0J5U5Q4ZzYoSnjQKiOKvaOWKX/ -RydUCrZyiyVl12tlEc/FcT//zj7XrNE8oHC9LaUWb6masCCzv0WR5Ck5XX3yC+/m -gsvjMK7c1I/tFjUQE07MO68qXCX2zzV14QIDAQAB ------END RSA PUBLIC KEY----- From 200f9c03a2993f9ad52f2932167d5646ad85ddd8 Mon Sep 17 00:00:00 2001 From: wasserfloh Date: Tue, 16 Jun 2015 21:29:46 +0200 Subject: [PATCH 123/132] Added mainz1 --- hosts/mainz1 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 hosts/mainz1 diff --git a/hosts/mainz1 b/hosts/mainz1 new file mode 100644 index 0000000..75cc893 --- /dev/null +++ b/hosts/mainz1 @@ -0,0 +1,10 @@ +Address = ic-mainz1.freifunk-mainz.de +Port = 10655 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1M84cHK5ok4qCghUrmtSRHv5EvzMV4XypivUv5b4wac3stusEhc0 +Wj3PgWrQjQMHjQWnOii/EcMUvRXD6pT3jZCGBOd/BHFherlmJUV8TgSjvABIbzmJ +vAyfICn6brdYVf6D+eJwQ43I2e/7hbB80Y6e0zbBo4hvc2AuiI8ipof61kdJZden +/F3+hq904rgX17P1bvJFtJcO80bNeYj0xl2LcribCZaMIjlDnHV883Pg/+rqrV7v +rBKfPlNHuA6ewYGPyKVadkyJuMsw1M4dY/Go2cPupQyBeybulj+43c1QZwXdg/z5 +za/FIE1bG3DiJS0EmPPZkrejZz7VLimXyQIDAQAB +-----END RSA PUBLIC KEY----- From 065cd5ddf2b315c1a3f7f8cc571cfcb0e4de18ee Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 16 Jun 2015 22:20:56 +0200 Subject: [PATCH 124/132] update halle hostnames --- hosts/halle1 | 2 +- hosts/halle2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/halle1 b/hosts/halle1 index 0cb00eb..fc21ee7 100644 --- a/hosts/halle1 +++ b/hosts/halle1 @@ -1,4 +1,4 @@ -# Address = ffvpn.3dfxatwork.de +# Address = icvpn1.freifunk-halle.org -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsYzXhlTKxR7YBUXHY0JscmtNbrFzZzviVzIhpuml499rh8TVhjMU ozyjbaPhSUy+9RY4F1WpRmDi3lyDx7eT0viRlOkFG8huApXEgGLQgah0M/pfwkc1 diff --git a/hosts/halle2 b/hosts/halle2 index e15833c..469f77c 100644 --- a/hosts/halle2 +++ b/hosts/halle2 @@ -1,4 +1,4 @@ -#Address = ffvpn2.3dfxatwork.de +#Address = icvpn2.freifunk-halle.org -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA0F40mEg2vW9emNFi/Sr10rN4d/+O6VGLKjHGfMtUXxM9xILBlbDt Tid/mB5eOJu6CjXxLAlxrx0Ppm49jooD0BJz/Ajk7Xr2FX1pDxCAxwBBGj2iruy4 From 4b7ee4a595ccac7320e540fd05c7b80fe1aead88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Jun 2015 23:33:36 +0200 Subject: [PATCH 125/132] darmstadt2: add ed25519 public key --- hosts/darmstadt2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/darmstadt2 b/hosts/darmstadt2 index 535dcf9..9c8a2e6 100644 --- a/hosts/darmstadt2 +++ b/hosts/darmstadt2 @@ -8,3 +8,5 @@ RW9lc+6XTrDv3I6XdNTe0Nj9XRkdoUxzJXQfLHLUx/ynymD7w1325cf5JAVTW8YK gZvUSZ+irwenMIc+qTv00z8THPQaB0wMoOfgEe8cA85sBxkAj8cOMzoiuUxjgk7/ WSejxCFFpXe6uXLtdWKNAPWoYUq3EXNqrwIDAQAB -----END RSA PUBLIC KEY----- +Ed25519PublicKey = OpGqPZB8LMeTamFWVz/h1y5CBnD8al35G2f3u+0hxMP + From 136bf6f61d6045b892fc24f516241ea0d3874e41 Mon Sep 17 00:00:00 2001 From: FFMee Date: Thu, 2 Jul 2015 23:31:51 +0200 Subject: [PATCH 126/132] fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7849425..80c3a70 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Hint: In version 1.1 this option was moved to the tinc binary and is called Date: Thu, 2 Jul 2015 23:40:49 +0200 Subject: [PATCH 127/132] a new friend for the cloud --- hosts/meerane1 | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 hosts/meerane1 diff --git a/hosts/meerane1 b/hosts/meerane1 new file mode 100644 index 0000000..e1dabdd --- /dev/null +++ b/hosts/meerane1 @@ -0,0 +1,9 @@ +Address = ffmeeic10.meerane.freifunk.net +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAym1/4gwwOUaCuUAee+JD0yPVSNbhVwJDkroqpcnSRDh6Zvyl/jTe +Xc/qB0eIba8EnuskBggF+Zkqfob9C0O+AxwxKMlv5tnR7XKS4/CYRoW5jKRkxDn6 +ObZC/DbizbNE3ZmbAdztdCBp8txhuog889xYx0gK/Xe8g5ICFkr7l5yyn2dxZDvp +Eqbi+b9fWalWTtyXwGio1WU+8EgnMG6P6re6kKIsCezR0vbHo661iG1MgV3B8liy +4zclS5bdukRBpuIU4BXW4dSJkXSbBFsOFxkPlgrZCpkxbFDQ0/awwgZ8nFE+Y3IR +hFQp+qR37FGFAjgo31CYNn2oLhJ3gjL8eQIDAQAB +-----END RSA PUBLIC KEY----- From cb695a88f29a06085d6b83a254a545e238143848 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 5 Jul 2015 13:03:37 +0200 Subject: [PATCH 128/132] add gl2 --- hosts/gl2 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 hosts/gl2 diff --git a/hosts/gl2 b/hosts/gl2 new file mode 100644 index 0000000..6303d41 --- /dev/null +++ b/hosts/gl2 @@ -0,0 +1,12 @@ +Address = 5.45.100.14 +Port = 656 + + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAubNEotpkRAKFlm2WtgOr7Xx8ZzUca7VkhqPAh/QprEBNdupViMvk +tKZdzHasvJQO0t5BmHZ8HAuQlKoHaagp5zEc5P8oGP+TS9A/QKwL/YyOXYoQ3Zx6 +edIXn5EJTXoCfM+q2DdS65HAQhSyuM3PJ0SoC85rStQfRBaShuF4oBlFEaKg4yYs +dTKlpM5ZEQLT7GVOF7dSpTyV6trpk05TfMZf2qWGRJU08/XOh5OzQH+TTDMTbbd0 +kn8BUFrH76vriOYma6kay8WN+egiNJhgfne8iOSPKPX0yzkPHA214wk3+1pmMcu/ +3Mu9habpoGFF0G1NSGwaQ5147QEhCt4pYQIDAQAB +-----END RSA PUBLIC KEY----- From c15fe1d5aadc2775ddf06b411941da0c4b08cfc7 Mon Sep 17 00:00:00 2001 From: Georg von Zengen Date: Tue, 7 Jul 2015 21:59:14 +0200 Subject: [PATCH 129/132] changed icvpn gateway --- hosts/braunschweig1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/braunschweig1 b/hosts/braunschweig1 index 7fbe162..5867751 100644 --- a/hosts/braunschweig1 +++ b/hosts/braunschweig1 @@ -1,4 +1,4 @@ -Address = gw1.freifunk-bs.de +Address = gw3.freifunk-bs.de Port = 655 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA1SlHQTdW8wnYWpSRwZWx5BHOHm+0WzZNN96edmUqAi5hrVQwVCeI From 503887d06f837bf457b518c38ac0cb567c8fd0e2 Mon Sep 17 00:00:00 2001 From: Sven Reissmann Date: Wed, 15 Jul 2015 22:25:09 +0200 Subject: [PATCH 130/132] Changed key for fulda1 --- hosts/fulda1 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hosts/fulda1 b/hosts/fulda1 index d9358ee..795e45c 100644 --- a/hosts/fulda1 +++ b/hosts/fulda1 @@ -1,15 +1,15 @@ -Address = gw03.freifunk-fulda.de +Address = gw03.fulda.freifunk.net -----BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAw97CxdW9jjI6gHExRsls5rCJ9mt2FW4jLg6AiUAlcKo6gJkAK7dn -TK72ckMBoFc0oQTqOAMtdxPGdkojqy9jfOGRnJrEPru8zfHaL2AHEy3BO8DTdt6P -43UB5dxymfEcaLi/5lMyjuwX1AwnWZwh3yHhUjjSIRo2f8Ph6iiVWOOCcTTv4YGb -8ODSNjtsmDtAv9Ejj4+GJaMAtKn2KP0u73C2ix169nUtfIdRN9OCx50ZHig8GVqZ -LwWK0zDpOStlgNaBhCne8LO8yHnMyimrNIBRORNFR04YtUt0ubiZqjLm14wFLe0t -zJqqquOXA7Es2ztvX5PP+xhyPv9N8hd5t4kg/2OExkZZ4JVN8Npb1bNQurEon38a -RFnbKSKXxrN2UGwJLKrJa3GkXCrFVn1M+/XnQkT2VjkaPYjOPDNr6j2oUj07/mAS -Xs74TBDIk+Re1xmUsuehzBd9CfhnWJCc/JOgZuLeWThm0RccOCFFRBLz92QFzVnZ -NXVGTLktNMGnMdDZ0EjLoXQzWQRJEJ4gSeQRfsFYFvMk9qPwRoXB1pMHSckNoSxK -4Bfwl+md6eF9g74aGQ0JrhO+mpUcSrEWbh0w4W4jhU7UuTxxAwKrHBYt77012QrQ -g0L07Z1lY4DB1FWXkkJ7VWI0rUJpCzUKJH34kQGhJ771Rwq0TGAli70CAwEAAQ== +MIICCgKCAgEAwKn26rKjqkFTPXm/aWVEw/oc2GsurG2YLGs1Lf7cD+zc7KFS3+lR +U5KKR96EE7+5qxZ+NCqWQIcA7fvPoLRrgc1jNRULSi7USsWI1kPlOac0hdd0mId9 +4XHZpQWuLewQ1ETWyzfp8kPSd2eF3iIGVGSGyigpOKSjxw+vPB7OFjfkdIto5+Jt +u+62Px/i0i7uLyfW2l8eB8Hf///Ca8RA4LhaPDO6MamytyBt0xSRzPH+HfFhWw8q +TPQytXvheSSw15OjiWpgsUeoNKF4JZK/IhIcpjdmXXWFQtWEixmj5IdTOMTP8jxZ +ihCTuQ+7UEiHjAg2/B/balAEmztJ5qMzklVaNU6gGMu9Q3ITdEK7i4hybyTf9D8H +QIw/F+htJJ+ninuyGM/ACigk5zmUZFLZXPSeLRdYJQqiJQXsPNrsGZMmeJi0RkN3 +qx7Nu2tCGsUVKAXf+o8O4SLC0fbAqdrI4u2g3sxQO6x8nRQWCUyF2rN0N171BkQw +O65MOII42RSCFFrXbcyVHMa4fmSSYjsQkKvrS8K8Z324cJEvRKi9gDLolSg2I2I5 +vcdrua/E8jU8kttcvo+umfNvt6XL6I4P/r06+OGqnMXfGeMMbazWze8HNM4eYYmM +WZhK7X/m3g0NEFRa1433lJmDQ4ONUkC+3vz4N8tjY2vgiQzBciCWGs0CAwEAAQ== -----END RSA PUBLIC KEY----- From fc7b26d657f717fa96adf34b05eaf49eefd9a3ab Mon Sep 17 00:00:00 2001 From: Kai 'wusel' Siering Date: Fri, 17 Jul 2015 17:50:13 +0200 Subject: [PATCH 131/132] New keys --- hosts/gueterslohbgp1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hosts/gueterslohbgp1 b/hosts/gueterslohbgp1 index 4e20e21..4e499a9 100644 --- a/hosts/gueterslohbgp1 +++ b/hosts/gueterslohbgp1 @@ -1,10 +1,10 @@ Address = bgp1.guetersloh.freifunk.net -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA9lK5No/IuY3o2NaIklnwYD/lHtHG4Qs6qjBGGrOmVJ1N2UsQRwVr -kbO5pi7sn6dX2xojn4u6WYDIXGdOEihlxdJ7SIgcfjlBSSkSlc73E4MAgG46tOSp -SdAKhllN2J614Mng2TWQ8SmQ0xMSR80FiJkwMnZ8pb4nUAr5kMiplzxZAxLrUyJG -0exDuKTPG6fKKIDKBXgO7gbUMbhGRpduo7BSS2VJ9SxtuVgI7Cs/d0O06f9L9Iq9 -krxzb42OHJk9pEQY8EB8jFQFiEdL7ShjXnJ+H5SeUyFX9bJZKyOYzAawwMWmkDK5 -Xm+6ZUW4XoMFWxJ79hLHu0oWxTcWWWGX8QIDAQAB +MIIBCgKCAQEAxChfHd+VNGxGtoqa48zNKTFdW0W4FdHJxxDhdCxYzPu9sUe6yJHj +bkDBnJW3JpOydqTsMfNk8Q7a9eltldutv6cg38cDzaQoclXPSSPdZVRBhm+tb5ks +DojJMtBmMS0QwZHfvHpQPC9VYGg3CBwA+6T9IebwECg2sYXfK+qOu/u4VfIrmBsd +Seami+PYK0IyDeWIrtHJdGM/XEMzOj8G7i4mOds8Ci+R/+8+rH8gOkbyWcdXQH7r +rnHShwUSgyVqP+lHhZZn9tNf/1+4LnsGumc5KvAVQAPoc8jIgd9JO9FDJpsVnYg0 +parf3RCJnWDO0QPBRnJSdgJ78j13yv2NuwIDAQAB -----END RSA PUBLIC KEY----- From e22c76a4821009ce5c4586273b16be164f63ebb6 Mon Sep 17 00:00:00 2001 From: Kai 'wusel' Siering Date: Fri, 17 Jul 2015 17:54:26 +0200 Subject: [PATCH 132/132] Revert "New keys". Should have been a pull request, sorry. This reverts commit fc7b26d657f717fa96adf34b05eaf49eefd9a3ab. --- hosts/gueterslohbgp1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hosts/gueterslohbgp1 b/hosts/gueterslohbgp1 index 4e499a9..4e20e21 100644 --- a/hosts/gueterslohbgp1 +++ b/hosts/gueterslohbgp1 @@ -1,10 +1,10 @@ Address = bgp1.guetersloh.freifunk.net -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAxChfHd+VNGxGtoqa48zNKTFdW0W4FdHJxxDhdCxYzPu9sUe6yJHj -bkDBnJW3JpOydqTsMfNk8Q7a9eltldutv6cg38cDzaQoclXPSSPdZVRBhm+tb5ks -DojJMtBmMS0QwZHfvHpQPC9VYGg3CBwA+6T9IebwECg2sYXfK+qOu/u4VfIrmBsd -Seami+PYK0IyDeWIrtHJdGM/XEMzOj8G7i4mOds8Ci+R/+8+rH8gOkbyWcdXQH7r -rnHShwUSgyVqP+lHhZZn9tNf/1+4LnsGumc5KvAVQAPoc8jIgd9JO9FDJpsVnYg0 -parf3RCJnWDO0QPBRnJSdgJ78j13yv2NuwIDAQAB +MIIBCgKCAQEA9lK5No/IuY3o2NaIklnwYD/lHtHG4Qs6qjBGGrOmVJ1N2UsQRwVr +kbO5pi7sn6dX2xojn4u6WYDIXGdOEihlxdJ7SIgcfjlBSSkSlc73E4MAgG46tOSp +SdAKhllN2J614Mng2TWQ8SmQ0xMSR80FiJkwMnZ8pb4nUAr5kMiplzxZAxLrUyJG +0exDuKTPG6fKKIDKBXgO7gbUMbhGRpduo7BSS2VJ9SxtuVgI7Cs/d0O06f9L9Iq9 +krxzb42OHJk9pEQY8EB8jFQFiEdL7ShjXnJ+H5SeUyFX9bJZKyOYzAawwMWmkDK5 +Xm+6ZUW4XoMFWxJ79hLHu0oWxTcWWWGX8QIDAQAB -----END RSA PUBLIC KEY-----