From 954cf0da5aa8af1b6e1f32df4a57dccc078b2034 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sun, 31 Aug 2014 13:04:00 +0200 Subject: [PATCH 01/59] 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 02/59] 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 03/59] 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 04/59] =?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 05/59] 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 06/59] 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 07/59] 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 08/59] 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 09/59] 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 10/59] 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 11/59] 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 12/59] 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 13/59] 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 14/59] 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 15/59] 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 16/59] 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 17/59] 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 18/59] 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 19/59] 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 20/59] 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 21/59] 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 22/59] 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 23/59] 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 24/59] 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 25/59] 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 26/59] 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 27/59] 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 28/59] 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 29/59] 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 30/59] 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 31/59] 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 32/59] 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 33/59] 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 34/59] 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 35/59] 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 36/59] 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 37/59] 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 38/59] 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 39/59] 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 40/59] 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 41/59] 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 42/59] 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 43/59] 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 44/59] 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 45/59] 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 46/59] 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 47/59] 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 48/59] 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 49/59] 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 50/59] 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 51/59] 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 52/59] 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 53/59] 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 54/59] 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 55/59] 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 56/59] 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 57/59] 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 58/59] 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 59/59] 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-----