camp2015: remove

Merge pull request #115 from ffgtso/master
Wiped guetersloh1
2015-08-18 12:19:59 +02:00 · 2015-08-18 00:01:53 +02:00 · 2015-08-17 23:54:53 +02:00 · 2015-08-17 23:53:57 +02:00 · 2015-08-17 23:41:37 +02:00 · 2015-08-17 21:55:32 +02:00
97 changed files with 729 additions and 518 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,10 @@
+language: python
+python: "3.4"
+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/"
--- a/.travis_requirements.txt
+++ b/.travis_requirements.txt
@ -0,0 +1 @@
+python-nmap
--- a/README.md
+++ b/README.md
@ -1,4 +1,75 @@
-This repository holds IC-VPN keys and configuration.
+[![Build Status](https://travis-ci.org/freifunk/icvpn.svg?branch=master)](https://travis-ci.org/freifunk/icvpn)
+
+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, 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/
+
+### 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 <code>generate-rsa-keys</code>.
+
+### 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.
+
+    # crontab -e
+and insert for example
+
+    @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

--- a/hosts/Treuenbrietzen
+++ b/hosts/Treuenbrietzen
@ -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-----
--- a/hosts/aachen1
+++ b/hosts/aachen1
@ -0,0 +1,10 @@
+Address = icvpn.nodes.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-----
--- a/hosts/amsterdam1
+++ 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-----
--- a/hosts/augsburg1
+++ b/hosts/augsburg1
@ -1,7 +0,0 @@
-Address = augsburg1.icvpn.augsburg.freifunk.net
-Address = 109.163.229.249
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBALVQaY0axASCewZdfMPbxUBwphhoDHKzm0SvpietNy0gy+43Jb+N/Cs+
-d9l9HlAS2ngrCAahVm/GRA3iYHH2i5JdZnzxPFKdkefcZFz7x0ZDaqeqpb2YLWFs
-z2LPm37OCcsi9NPZtvDG+0Nas370xDn/6uZhCd0gAplDuI+3m0vRAgMBAAE=
-----END RSA PUBLIC KEY-----
--- 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-----
@ -9,4 +9,3 @@ FaDXnHb7Wt7rYWSlT46q+/Zt7AZiHgBd/usMMYC5LFvR0Qgc8ucIFYRUx45xhpas
 ybwKAkWQ1bw81+z3hElADcXl7SwH9PHlk07hU6Q1fXgff5OIPxC7SzzSKFjyhOIA
 dvKC4YdGD6FA2kP6N3FIe2Oio2LPPBSDLwIDAQAB
 -----END RSA PUBLIC KEY-----
-ECDSAPublicKey = DAAIed61lV/AudLIIE5Fb2VVp7sYR71IEcfPgEADGUL0z2JHci/ymtmp2wp4kAzu+JP8SGR1F/ayhPLQHD/tbG9e1D
--- a/hosts/badzwischenhahn1
+++ b/hosts/badzwischenhahn1
@ -1,7 +0,0 @@
-#Address = ffbz.ath.cx
-#Port = 655
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAMlCF8Yj3adfH6Mssc7J59CMIzO4ZTa4meHXDaGWHXzGIMnUWRUlLIfp
-7sa/uJ4U9iQU3ZEwv1cPWweDvWrG1HNL+oJEVv7xQWcBXaYnm0le305qom0E0U5U
-cMt+yNZWTh2KfgJjGB78FuOas1yiGpVPnV2wAGgzREKgmiXTOzZnAgMBAAE=
-----END RSA PUBLIC KEY-----
--- a/hosts/bayreuth1
+++ b/hosts/bayreuth1
@ -1,10 +0,0 @@
-Address = freifunk-bt.criede.de
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAppgeP431r3K4cgy9s1XUB/+SEb9F64Y9q34jxjwRssIaFx+mtukr
-JDLFtRNNTi7ao+kL3s1OBhavCeKwYSFAlaQnIm7fLwKwhJiIZwnKVM26SJPUwPfP
-pQZkEv8e5boFCEhsSGcLGLineG/TUDYa1cfwKL0kUc7KiTczm/2w5FQhiqUEc/Cj
-espO57hhzoI6Ian1PIFXjpRceTRvrBxFyg5p6uNRGENa3o0Ixf2u3MT2DuCAzbW8
-ndAsnqUz3uggc1scoy4/mMoFDEXfWkF6wbnpNAwEpnaDDgMI1eUgivuphiJOkqcW
-C3hHDdGbYQ+zKqukqvGjcKTbMjLzOLnL+wIDAQAB
-----END RSA PUBLIC KEY-----
-
--- a/hosts/bielefeld2
+++ b/hosts/bielefeld2
@ -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-----
--- a/hosts/bielefeld6
+++ 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-----
+
--- 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
--- 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-----
--- a/hosts/bremen3
+++ 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-----
--- a/hosts/bremen5
+++ b/hosts/bremen5
@ -0,0 +1,11 @@
+Address = vpn05.bremen.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAyMFsxTq0jV63n3m3miKKCfW3NtDiUgY7P8piZWZIudx4/PFr96px
+M2OlB5H6g70Fj6MiSFZ9Hnb2mtBjhT7bBBfMnBl1WNeH6vUJh0vQ1G02cQDJkPzd
+Ir9djg2jFDkh3NkA/gt0ZbQiqFXAdbLfU8wJvDUe35hocU7K+4y4ZQ9G95zmh62c
+wmiAZoQmZHZBZaeMyACMtnEncY4onefJrK973+5W2LguSIzbpohyOCmtZaSy/3ei
+oxzNvQW4mmJz3f4+dbJ1FEwTRdgfvIPIDT42UgZAQQLn8+iXOf45ghCOi7ef4ZLb
+pdEHfufyIHaJX95hOedbmtJCOHc12nT3qQIDAQAB
+-----END RSA PUBLIC KEY-----
--- a/hosts/castrop1
+++ b/hosts/castrop1
@ -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-----
-
--- 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
--- 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
@ -8,3 +8,5 @@ RW9lc+6XTrDv3I6XdNTe0Nj9XRkdoUxzJXQfLHLUx/ynymD7w1325cf5JAVTW8YK
 gZvUSZ+irwenMIc+qTv00z8THPQaB0wMoOfgEe8cA85sBxkAj8cOMzoiuUxjgk7/
 WSejxCFFpXe6uXLtdWKNAPWoYUq3EXNqrwIDAQAB
 -----END RSA PUBLIC KEY-----
+Ed25519PublicKey = OpGqPZB8LMeTamFWVz/h1y5CBnD8al35G2f3u+0hxMP
+
--- a/hosts/diac24_sbc
+++ b/hosts/diac24_sbc
@ -1,6 +0,0 @@
-Address = sbz.icvpn.diac24.net
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAN8O1i0kkDsktLuFbL01x/Mj47KtTMQUm373NthJoYeuxh7Uc8eud0E3
-FoZBcMCn7LKRvLh8HH83re+SAeplZ5nFqYLBEIZtonhRlP+bnIQDjGCwTaXXp2ew
-m8ZAPA1TPRl6e3ZzJw7CvGZrsiKfwwNUaEp/AIrdJ3p55fUehiFNAgMBAAE=
-----END RSA PUBLIC KEY-----
--- a/hosts/diac24_sbz
+++ b/hosts/diac24_sbz
@ -1,6 +0,0 @@
-Address = sbz.icvpn.diac24.net
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAN8O1i0kkDsktLuFbL01x/Mj47KtTMQUm373NthJoYeuxh7Uc8eud0E3
-FoZBcMCn7LKRvLh8HH83re+SAeplZ5nFqYLBEIZtonhRlP+bnIQDjGCwTaXXp2ew
-m8ZAPA1TPRl6e3ZzJw7CvGZrsiKfwwNUaEp/AIrdJ3p55fUehiFNAgMBAAE=
-----END RSA PUBLIC KEY-----
--- a/hosts/dreilaendereck3
+++ b/hosts/dreilaendereck3
@ -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-----
--- a/hosts/dreilaendereck4
+++ 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-----
--- a/hosts/ehingen1
+++ b/hosts/ehingen1
@ -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-----
--- a/hosts/erfurt2
+++ b/hosts/erfurt2
@ -0,0 +1,11 @@
+Address = 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-----
--- 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
--- a/hosts/flensburg1
+++ b/hosts/flensburg1
@ -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-----
--- a/hosts/franken1
+++ b/hosts/franken1
@ -1,6 +0,0 @@
-Address = gw1.fffranken.de
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAL7Zdz7fpxIkUm8hvxK0Qm+iS11d9AN1BmjLrMZU9nlUwf+NTNIX94Ng
-XV1GINi9U/RF6j35JAyt6Y2K7C3BjHM2Zl8rm2ya2lhvoKhsDJTe1x07BnhamzEs
-k0xufslEH9ZatR7FDYzKQa1qPFxLyojDymYiap+L/7QD+Q8eU+dFAgMBAAE=
-----END RSA PUBLIC KEY-----
--- a/hosts/franken2
+++ b/hosts/franken2
@ -1,7 +0,0 @@
-Address = gw2.fffranken.de
-Port = 656
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAOvt5phPFC+/KUvmGWJdNfIoPWuHfJb0na25VteGQDUMn0krudoIJQFb
-snELlAl5emnNbH7W5NWGKfjl7fMRC8RJ7r9eb1/jjsRlDK6aRnN8hHzcCa45PCeI
-m1plGxS6SC3kI6lRB9gjXoKe4GPl+fi3F7sk6fxxIxDBQSnYFWMnAgMBAAE=
-----END RSA PUBLIC KEY-----
--- a/hosts/franken3
+++ b/hosts/franken3
@ -1,7 +0,0 @@
-Address = vpn3.fffranken.de
-Port = 657
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAPIkkqmdnJi3Y+cGKslf0t+swE+7rtfRQTStW29MP62L6Sn0lxb5MufU
-LRtR0UW31SWQ03HGuUe51e16ppxZ3V1AFQvoLAwxwDD6VvBk4n+XEiupWPt+0XSd
-vNQAM3GOtMVQc6W39ZEa4PaMr44x256W+KnHgNrAL7v+62j+9nJbAgMBAAE=
-----END RSA PUBLIC KEY-----
--- a/hosts/frankfurt1
+++ b/hosts/frankfurt1
--- a/hosts/freiburg1
+++ b/hosts/freiburg1
@ -1,7 +0,0 @@
-Address = port-87-193-156-225.static.qsc.de
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBALo3VfMiPxK5lxWOYqoCZavMp8Lo4HYTmhLR6w3dHDJTI+UKTNDOf3Tc
-reO0q+K85uopAtuu9yEshMxapvmijmEO9YsD+XinLNvnwNxx7qSaVQrPFTa4MutK
-OuD1fP/PyX12XOnPsjw/CecqhbkCDg8XwFtGZcOJq9Z6DPvyotvJAgMBAAE=
-----END RSA PUBLIC KEY-----
-
--- a/hosts/fulda1
+++ b/hosts/fulda1
@ -0,0 +1,15 @@
+Address = gw03.fulda.freifunk.net
+
+-----BEGIN RSA PUBLIC KEY-----
+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-----
--- a/hosts/gadow
+++ b/hosts/gadow
@ -1,10 +0,0 @@
-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-----
--- a/hosts/gera_greiz1
+++ 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-----
--- a/hosts/gl2
+++ 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-----
--- a/hosts/goettingen1
+++ b/hosts/goettingen1
@ -1,10 +0,0 @@
-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-----
--- a/hosts/guetersloh1
+++ b/hosts/guetersloh1
@ -1,10 +0,0 @@
-Address = gw01.guetersloh.freifunk.net 
-
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA1V07P1Lv4dafLwYUlZcsj+tNMrNU+jV2N/+h9RA7wnst77TyFMqZ
-/AmPnFUNQ6TyC/GuK8YqQV+Sx+2MWzVska0F2uY4T+YJ4aDAZhua3YwJCHEUODuC
-6yWmvujCOmZ5WTusPd6Nw+jUtZPXfmtWSBXdlyf1q8uu6ZTGUf/BdeXHUSXm3607
-vcaY5gkSVDeEOiYm1BR4iqvljTpKyXr4kHRGk4Bs/arW2g4HQH05VFCP8V2di3Ev
-qzWkX71gwHAf8fgrPchYAsihrBbbKxPYpVDBehbdofyETHRaJAVnBFIBgKWSJfFF
-Vx3j5miT5PvRRdLXKZkNztgFLaj+yLQrsQIDAQAB
-----END RSA PUBLIC KEY-----
--- 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-----
--- 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-----
--- a/hosts/gueterslohbgp3
+++ b/hosts/gueterslohbgp3
@ -0,0 +1,10 @@
+Address = bgp3.4830.org
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA4cZSwPeKpX00lJOkKbEXQKdFsnOKwMWaU8T2oadaPdmWLz8xKIXz
+Pb6CEDfxFfGW87OropAfPT/gZljFU88EShNN48N1/SOQ0KbOUwFJUD4UEuL4VuZE
+9aJA1JAthpxhMXS7taAmnINZ2CgROPEcER9xMVrmx25Z9T8pOnDmKjvEeWb1w3DV
+6qN0z5FbqF9ykrgMV8vhnK8HEz1q9iuzagjXy7O04uhGkBSSOBk7/Ie8luOWHjnJ
+4URFRLUgYO3ZCjq9oEsEVCQtcmzr1U+a8GBY9zEVKB15bG6dH4KuJIpJBWOqe1XE
+Xc610yCa4U9f8SIu+gqNmTpowie5OemnlwIDAQAB
+-----END RSA PUBLIC KEY-----
--- a/hosts/gueterslohbgp4
+++ b/hosts/gueterslohbgp4
@ -0,0 +1,10 @@
+Address =  bgp4.4830.org
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAn2hbVCw7yAGGMCVQcWMBzhWpp9JdW/zGRuE16B5YAfNQVWs+uQzz
+cntoOGCXmn3JsdEjsryIE+26Zb7xwnO/od5GTP5WxZViH3ObjDHxlaP+KKP3oQyl
+C8sQjjrWInLYNkubp1xaWui84WMsRrdKMNjCKsfxRud9NP2Tksb9passbjMB9DaH
+JrMcl3kfQFZjkRqVRvzLomYFcZBFYOii5IodeHt9wy5cymWUCvvOs8+pu2vd274l
+mtFR1TBx3KwC1zR6g8Ggy0hnq7nTV8pX/9qjBcqHnIlbTiPdgqxyH42m9/pLnkBp
+LghlFJWoRe1MMH15QC2SteJJ7quwk73XewIDAQAB
+-----END RSA PUBLIC KEY-----
--- a/hosts/halle1
+++ b/hosts/halle1
@ -1,9 +0,0 @@
-Address = ffvpn.3dfxatwork.de
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAsYzXhlTKxR7YBUXHY0JscmtNbrFzZzviVzIhpuml499rh8TVhjMU
-ozyjbaPhSUy+9RY4F1WpRmDi3lyDx7eT0viRlOkFG8huApXEgGLQgah0M/pfwkc1
-m4xHNKwDvzJIDSR9Xq2HI3Blygr11yM7EqA+8iLAmxpT3mYqHMq4F/pzEY9p5HEN
-T7/m+PtdhO1m7vdUwh0fVz24Fa+Vwp78HmqVQxkylB8r+jM/9iiz+dajylyzeIC8
-n/wXT7Wd+bUn5K+pxWS5ReUKzDnKNkCwYcu9yO3F3xsCWg593Rog7xmILhmRzGvR
-QianIwhsORSIHAJRPq4nVFPbv4qX98zhQQIDAQAB
-----END RSA PUBLIC KEY-----
--- a/hosts/halle2
+++ b/hosts/halle2
@ -1,9 +0,0 @@
-#Address = ffvpn2.3dfxatwork.de
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA0F40mEg2vW9emNFi/Sr10rN4d/+O6VGLKjHGfMtUXxM9xILBlbDt
-Tid/mB5eOJu6CjXxLAlxrx0Ppm49jooD0BJz/Ajk7Xr2FX1pDxCAxwBBGj2iruy4
-DXs9KL54EoI+Eb7rsX0HqVLVZK32yR8B1DTTMKNyjIyR3/t33nopUPp96C1XCazP
-MpIPhnCbzqSnqRSIXo8/w4IcqaAE8/XpivRuLu3XAiIm0Ukuw3ZAJ6tS353Lj6+q
-1aXczRUu6LYpaub7owK0BF4o4TSrJcWbYuO+1gcs+5PnPNzuKXE1aT0FmG3cCU6J
-I3OylXC9/VmcN9BEBOYkAxA0sV2Wr+3szwIDAQAB
-----END RSA PUBLIC KEY-----
--- a/hosts/hamburg01
+++ b/hosts/hamburg01
@ -0,0 +1,10 @@
+Address = 01.icvpn.hamburg.freifunk.net
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA3IbMWLjnM3S4HsFfKvhJdg9TYRPnzxRyL2CaL5KtcCTu8mMMOeCX
+arfhaM0l7l/hr2/TrpjDH3NO+lT0mn9cwl1Jlq3bkNXiBghf+tgGJAr29DLm0teB
+bvxy5YgL4qbWknNvqDRuLr7IFn0bScd8twN9mLeXzAmRCl43zzLMoYIf1A67Bt3H
+pZ6MoIVF9ziw9E4s0cdaRx4S6Ok3h6ochCfoNAUAJhJvodOdjW9++Ffy+LLayBIZ
+S21vezhhcb7fJ2qSO6x42Kp3FBaEY8zpOVdtPRX171xTUIv0vxYfRGsaOsT0biQc
+EGCG3ch2HiwR7TDe4gpe7XV7+QpUY1dR/wIDAQAB
+-----END RSA PUBLIC KEY-----
--- a/hosts/hamburg02
+++ b/hosts/hamburg02
@ -1,5 +1,4 @@
 Address = 02.icvpn.hamburg.freifunk.net
-Port = 656

 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEApyg+KLP9XfIwOIgBHjbGgt0l5ve+/O1Mec3ed/d0q6Bh+oTkJxOn
--- a/hosts/hamburg03
+++ b/hosts/hamburg03
@ -1,5 +1,4 @@
 Address = 03.icvpn.hamburg.freifunk.net
-Port = 656

 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEApitk4y7bZ8yI5U7pY87C8OdHMiYMQbMfd8KmttVhCFHaXgpbp6L5
--- a/hosts/hamburg31
+++ b/hosts/hamburg31
@ -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-----
--- a/hosts/hannover1
+++ b/hosts/hannover1
@ -1,6 +1,14 @@
-#Address = vpn.hannover.freifunk.net
+
+Address = icvpn1.fnorden.net
+Port = 656
+
 -----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAJsf2VLpTQlglzwBWe2B9RIgTEl4Y2a22Xt0DMPRw2vRc4aLcYh9G9TC
-IvlXl87TKILdkZ8jlK9cMmwupAmtoxlRUCDkode1dqZ/Knf+iIOCP3jBPDggKKcR
-/8MmS/ao+Ujb9tTuzv8KhVOqAcezKAHh1rVjriVyhCS/PhmZDViZAgMBAAE=
+MIIBCgKCAQEAxY3slVypvzpDIIBtgmOw1RQD8i+Fltb/aVjnaQa0TwwJh02wrzjz
+Kf5iREZ0sLwlaRaQRqrLZeVmwd9ZBZkh1Mk0FqThfszGtK2Dny6YmjENKO0QosUp
+HNoh8bJjUc+4Ms0kLv+ONBLNRzWRbo+9U83ckcmn0ztqg79SeT55bRhwXxtiCBQz
+wSvkO7v8h6pOgPsSfIdKodu8YOyPylR+ZKvm6MtR03UFn69Tlr1xRwCrnyl6itVX
+7koedeCMfwme0TEMMWh9+JudwT5PCXssXpy2W1mQ7XsT2SZe36mfHdnTKRn9vVUo
+qfEbZ2bPKsoLmL/46WBT5kJ6UwTsbISHlQIDAQAB
 -----END RSA PUBLIC KEY-----
+
+Ed25519PublicKey = qbvOwgemN42WxRBxRL8j8NBn+1Fn/RbYsiBGO2oHgGH
--- a/hosts/harz1
+++ 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-----
--- a/hosts/jena1
+++ b/hosts/jena1
@ -1,11 +0,0 @@
-Address = ic1.vpn.jena.freifunk.net
-
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAn+x87+EeNVLsIp8qLgXQ6sQjd1EXM8yzgh1TXFY4QpNwC6v4t0e7
-UHCDiy1dP0cnZUp1ox2EXcQMZsFBa0/9qtDFns7hubjOOHeCICYUo9M//xF9+jN+
-hXAiZNAdo6LeDyjA8P9cWxuksV9GCVIWEofeWUP/1jBFVm548TEwFWAP3LKnYnz6
-HhfOyP5N4IAdMwxEYs1Qenj660w21jPnHayVz5kgzNzpzw90iH3REYUq1SPpupUr
-EjQcO3lyZFb/Jbz0TweEsco/wdSRWBHR7cl5xp6dL93sIfU12cY5YynKjlF6g+m5
-x3fAcyPoRPq29XLrrqpjUwBL/fhplvLxGQIDAQAB
-----END RSA PUBLIC KEY-----
-
--- a/hosts/jena2
+++ b/hosts/jena2
@ -1,11 +0,0 @@
-Address = ic2.vpn.jena.freifunk.net
-
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAtn7NFxmQQkg+YIwNuvuVmy5lpodNAM9Z/k8YfPH51c9CEpK3SLM7
-EhoVqr16QTGxpr2eHqmW3vpT6qvgQoa/mdy3tpi36g4hgOEFAJ2gWvbHiALXi8YD
-hST9uKHstpf8w0WuIUMjmW34k2JHtUrX/W1Wb+FamGbgQR/UNgIktyAfFzoFNJgz
-MyxAoEsVyo77NJYLb6PAfBCy8sQ06EhdGC+TyfLe+vE/h2ymvsaxU8xqZ0PgW7Mp
-Zrss0PyB+gsR7fZFJBKpVZK2VGXK86jR5sjdi4u1Q75JW7ElaSbtU94xlmYGrX9G
-o4JzqquSAqMWfidNyv0n3EuSbGHOsP9eOwIDAQAB
-----END RSA PUBLIC KEY-----
-
--- a/hosts/karlsruhe2
+++ 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-----
--- a/hosts/kassel1
+++ 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-----
--- a/hosts/kassel3
+++ 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-----
--- a/hosts/kiel3
+++ b/hosts/kiel3
@ -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-----
--- a/hosts/kiel4
+++ 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-----
--- a/hosts/koblenz1
+++ b/hosts/koblenz1
@ -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-----
--- a/hosts/koeln1
+++ b/hosts/koeln1
@ -1,16 +0,0 @@
-Address = fastd3.kbu.freifunk.net
-Port = 656
-
-----BEGIN RSA PUBLIC KEY-----
-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-----
--- a/hosts/leipzig1
+++ b/hosts/leipzig1
@ -1,6 +0,0 @@
-Address = vpn1.leipzig.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKL7eWHmD2Rn6IP7JlSWtkphokN785g8nccBmfcjbwEwiZv+EFaVoid/
-0dPfvHaX0GaQGOhpef3PVHEbIMuU8dD9+7WbXO3+hUSIAfHoIdGK7n8qFtzTpzqn
-HAWcgneIE+sZVZRKC0B3VyQ8XujHuLCrQYkjRmVzvbb4cSzE+YhxAgMBAAE=
-----END RSA PUBLIC KEY-----
--- a/hosts/ljubljana1
+++ b/hosts/ljubljana1
@ -1,6 +0,0 @@
-address = gw.kiberpipa.net
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAL4X76pBCF0b/z45rFPbgTrKpISle9MbLqvq3tDc2fTERowis0aBTTuK
-mfVIQkF3W+8JMcjQdez5tQWKHnfpz4PmdSC4Dmxolgk/d9b7HNQTP8MCmCLzf+D7
-nT4TLS1ZZH9nTnLbVNINNIHZTLU+8AfX3IOLCG0Shw8qDNH0QxT1AgMBAAE=
-----END RSA PUBLIC KEY-----
--- a/hosts/ljubljana2
+++ b/hosts/ljubljana2
@ -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-----
--- a/hosts/magdeburg1
+++ b/hosts/magdeburg1
@ -1,11 +0,0 @@
-Address = 1.icvpn.md.freifunk.net
-Port = 656
-
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAtZ1qWJeuTakY3AfQJ25aduwwq11dc1bBZXor4T1Fv0GuBgV6BZjJ
-TRqQendJ5HruYw5udafWZy/ZjAha2tBmj/e+wIes44lnwy/XI0TkJgLtIOznp6cW
-PZ/hlOBt9Z4nNB7lvhFmTYnTQpVwdA2gxvRfOqgEz5kuSadu23FXg562QgfHU9b6
-ob22NRf0Fuu9sfHIdcrUoxwZDfQaFjnpmHfRmdcjJp2Fy0MnptzYXCg7aD9TsF5j
-qdEtjSu0MvvnpxzcYZRWpi0ErdZvXBqh0f7DtHwvX2bS6FaGFe/Nj+I7JDlqQ5jh
-3FOkdmyta9Pk38GfdI183g2LmRYDl/8paQIDAQAB
-----END RSA PUBLIC KEY-----
--- a/hosts/magdeburg2
+++ b/hosts/magdeburg2
@ -1,11 +0,0 @@
-Address = 2.icvpn.md.freifunk.net
-Port = 656
-
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA6v9HoQhGnAaWsSofuT4gplTOBhzmDz23wdQeWkVKM2tY7WCA1KNO
-7cUmVefNOejtm5H4qhLqMze5gkj9DaSXVaWvzxCnz80wH6MzdYaQU/v0gq+VL2DZ
-7M5EZeGNYdwvdBXq3T/suMdMC81E3FJnvLazdk9XBQdQivfjfqlFLWTMivEdjDN8
-9MSK1vp3W5KqfQbx1SAVz7Bsca+Jpn75KJVt7AXL6VzVbHi6neVuKlxj4mT5iVc+
-00ESOxZ4f/0XAjpLfaDYv9eu6w7mwQtxfksjDAce4R5AcC8BJF98RZne27twM5jz
-Ykorh/NOpnajo99q1Lb9h7c2vcqj4t0RSwIDAQAB
-----END RSA PUBLIC KEY-----
--- a/hosts/mainz1
+++ 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-----
--- a/hosts/meerane1
+++ 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-----
--- a/hosts/moehne003
+++ 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-----
+
--- a/hosts/moehne103
+++ 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-----
+
--- a/hosts/monitoringmoehne
+++ b/hosts/monitoringmoehne
@ -1,3 +1,6 @@
+# as determined from `tinc -n icvpn info monitoringmoehne` ;)
+Address = 188.165.145.158
+Port = 656

 -----BEGIN RSA PUBLIC KEY-----
 MIICCgKCAgEApOhvm7ohievOIunqK7L2zb1Y40msF65qvwRzLr58x9byIp3pw7Ay
--- a/hosts/muenchen1
+++ b/hosts/muenchen1
@ -1,10 +0,0 @@
-Address = gw01.freifunk-muenchen.de
-Port = 656
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA20ydh6auuT+FCBp5RiOP0PxaH356/zx3YxO18q8bJFnVXIyrVhLO
-QnhDGpEqYcccNMdmVPHQiroWsfOrNwBf69OyZobndbHVfFCC/HNtVl3EHPRClIeS
-oIyGWvXpnXCrpCUfghNPhAt/JoUM5fkKkNA+/vyJzU+RTBu6A1h3HnGshDMDnt5T
-Fe2J/8S00p0M8NjZiRyRMwhq8cx2XpK4rRN41Rr77Mafe6dhM9w73hCHp/GX1W8S
-2wByI+yoUMz8ld35iYoKEVQkWapGrvG/4ZvSJkZw7dtwJuRxyoXdjCROKWsTPDnR
-TIuD7yd4DSboEk9kCED4O4BPtMYFDIlkUwIDAQAB
-----END RSA PUBLIC KEY-----
--- a/hosts/muenchen4
+++ b/hosts/muenchen4
@ -1,11 +0,0 @@
-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-----
--- a/hosts/muenster1
+++ b/hosts/muenster1
@ -1,10 +0,0 @@
-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-----
--- a/hosts/muensterlandFK
+++ b/hosts/muensterlandFK
@ -0,0 +1,10 @@
+Address = fusselkater.gw.freifunk-muenster.de
+
+-----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-----
--- a/hosts/mueritz_bgp1
+++ 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-----
--- a/hosts/nordwest1
+++ b/hosts/nordwest1
@ -1,6 +0,0 @@
-address = vpn01.nordwest.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAL0EZpLOsOimfcTybJByDdI39NjG7Hmu456sYpJTbNt1wFW8BqrtcWCx
-+lv6+kS0Vx1z3KBjPh5H4wSCP00SmNcFKMde5+2LAe6mQcAs/daRhccyw9T1f6uy
-o6j5+gscVjM91wwEO1K+KZNHnZhzRtiwo3muclspQJplNLbhhEphAgMBAAE=
-----END RSA PUBLIC KEY-----
--- a/hosts/nordwest3
+++ b/hosts/nordwest3
@ -1,10 +0,0 @@
-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-----
-
--- a/hosts/nrw1
+++ 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-----
--- 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
--- a/hosts/ostholstein1
+++ b/hosts/ostholstein1
@ -1,11 +0,0 @@
-Address = gw1.ostholstein.freifunk.net
-Port = 656
-
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAoWCQbASGuIfvD/i2jzm2uudqYcZ8Fc/l75RIYSdk/rujVTlN98J/
-p+abYXHqkfmCejjOEjnFsLgUFtl58CagazUDAYHGZjsia0hb9pxG0gd8z1Evyuus
-Hbrw1ZgJxsFWfsFB+QhdhlEiECBB43aI+ZFTu97rqMyK+43On07jAw5wTe5Y1lJ1
-DZYIubdcr4JLXKh+oQTT6BJwgkxZhciHbtJoddEUmLsqdIMNapWWswPljQ8KywUx
-y8TwIAGmvJT1M/vAQg6g4rHlTICZOvahNz95avZwwpOUCOjO9FY8flZpy7g85aXp
-wZSN0aaYd1GYbaQxYWzyTYZZT+WxGSWuZQIDAQAB
-----END RSA PUBLIC KEY-----
--- a/hosts/rheinufer1
+++ b/hosts/rheinufer1
@ -1,10 +0,0 @@
-Address = rheinufer1.freifunk-rheinland.net
-Port = 656
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA5MIt2T0V8Non2Tpv9MmA8I6ekEaKl/sKZIz2LMzYe7n1wOh6ncHu
-INd5PklfgEFEPwRYxvrVs/kFWwFZJJqSr5i8eDfUMH0qFkJIrync9y9EhhTdiwdw
-+dQZooNYByIxxEAZDiev1ptunCdC1uIe5VIqHBDFI6tieYKtSd+5eTBIk0kehBqy
-Pn9+8gTFqqrqkhPMBgZugtX09MItL98fTTque4snF8GGsAI9AcQ+Cx2hSd1HCVM/
-22RVSz8nO2aIxl+AqiBpWAI2JnB6uzq/OyvV6GwMAetXNyzenE4OCnZmqymSGrnR
-wVFVCrIUGqLFLxerHnzosrzQ+JI5YjzTWwIDAQAB
-----END RSA PUBLIC KEY-----
--- a/hosts/schwarzach1
+++ b/hosts/schwarzach1
@ -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-----
--- a/hosts/trier1
+++ 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-----
--- a/hosts/trier2
+++ 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-----
--- a/hosts/troisdorf1
+++ 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-----
--- a/hosts/uelzen1
+++ b/hosts/uelzen1
@ -0,0 +1,11 @@
+Address = uegw1.freifunk-uelzen.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAtU1/lyX5TBRpy/DeHucVDL+SrUqEbNqpeIYzTBsb/Z4/7qap9W/9
+AJDyIwQGFX4Yu8U3POl0tJmjbnBspsh5FFOHkkpgII7jeUy0/7085+W8HtQwnRDA
+xYosgMMLOzmpBhxwOr/tIG+HmlFHYdQQm251CIB8XxZmIbyMj7A694tAbuYdRnnt
++CUj31+GXsKQbJKKAPuv8t88KFP14FX70mavfDBTvgCGNibs5elx12CtEGxSGoz
+IPaEf03iwOzx1QfV1uKyri/wEj49ELEn5MeZFK+BziaZjVGQ0GMcktGIx2ovB7ad
+NGOxp3gJDmkQmfmtV/uRP7KbGl4IMQVx8wIDAQAB
+-----END RSA PUBLIC KEY-----
--- a/hosts/waldheim1
+++ b/hosts/waldheim1
@ -0,0 +1,9 @@
+Address = vpn01.freifunk-waldheim.de
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA+DamB7iSwBw17Rj5MllCedVBP/7LkfJ7zPiaMtjjns3YFdDJQrlq
+Tsr5JmiWz4ijSt17vc9s2Qy5ZZ/JBBAV8SAA8riQoeqcy0YZx2jXi1FOxYaZD5r4
+7ylvr8B+tjc+1ajTvKrmoQfP607763UuTU7VlC4DKrrddH7iiYiOOmCmq27Smr97
+6vZBREE/bB+qTfAvmzvxPKHTM+LlWlsRatLHQvdji0j9RW2Q4gVIEB4nc6YeHzUw
+UL8Hbo+LheP/EUBcZqinoIHcdZ2OvyehImYjLi0MvU7FsWdfHmwHcSJJUp7VpToq
+CpLAQ6zf6QF7jOQjtPjJcQQlW9MwopLMUwIDAQAB
+-----END RSA PUBLIC KEY-----
--- a/hosts/waldheim2
+++ b/hosts/waldheim2
@ -0,0 +1,10 @@
+Address = vpn02.freifunk-waldheim.de
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA6JPQIdk9Ce6g3cLlEHKlEFed5UuSSlNIavM+i7ePW4wpjyVSd1Ib
+1L57lJhyDjeoYWuV45vQZSalUIyuThx93m5Xd1K0sf3smO5U5s7wOv7Zu5xNHSWi
+s5IvTvhkBCcqmVYI2xmlb9kFyEs+IuCRftzKdqnfreMbZKV0w2XmTur/KfN0xBlu
+7A9b8ncn1ENY19aVTdr0DkUS8nf3CoP2c8tr2+cGHumTdKlq4jW8+QoJ7hRzxnd3
+bppQ0Ox+UF24jQVP+8UOAfJtQtw0bMVfw5BFeOLic1GDjitWDliWXfrOQgKLKRFH
+32usGFXS4YQZ7n1Zq4xbjNwTARTETmgRQIDAQAB
+-----END RSA PUBLIC KEY-----
+
--- a/hosts/weimar2
+++ b/hosts/weimar2
@ -1,10 +0,0 @@
-address = vpn2.weimarnetz.de
-port = 657
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA3fPb1CWkdbKcL1Cl+klgKYV7hLJppEg2pU0Sm2/jTp0yIFmhfSYx
-GGTIbJnlZD04AKVxeJY11F5KwWpOaef88zRtZAqLs6VtsWXpKrPe5hM2Wc4phAJC
-5xOgvzvyPtFlf7oLt8Es+owbiNuf+ZavtIKLjhkDK5BwBiYGTgV+d184WJKSxbUx
-2RpP7vUpK58xVhMi/nAZBxnG2OkDAxReaq0iB208SlsiLUfxSvTUpI/BqP0HIezK
-pO49Kdq191PH+TWhdDh9IsEFUIEyX5rS5S+fR3P07k5XImPke3771qt1oHnSPSvq
-2bsBp9PWLecIBtnZxwsbRvd65vRL+Pg71QIDAQAB
-----END RSA PUBLIC KEY-----
--- a/hosts/westkueste1
+++ 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-----
--- a/hosts/westpfalz1
+++ b/hosts/westpfalz1
@ -1,4 +1,4 @@
-Address = gw01.freifunk-westpfalz.de
+Address = gw01.westpfalz.freifunk.net
 Port = 656

 -----BEGIN RSA PUBLIC KEY-----
--- a/hosts/westpfalz2
+++ b/hosts/westpfalz2
@ -0,0 +1,11 @@
+Address = gw02.westpfalz.freifunk.net
+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-----
--- a/hosts/westpfalz3
+++ b/hosts/westpfalz3
@ -0,0 +1,12 @@
+Address = gw03.westpfalz.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA43wJIE0+U/KMLKbgkzKSTnVYHSn1sUWG51HdA3SXojwf5ythy3vx
+oRS9xwg45tYqk34HEAGMWHjmJjKaSxOrfbushsaTKvRh4d/4v7/Y+n2rDmGmPmGZ
+O4Hp7ik6gZgM/82WSYAezJUBszHfvFS6VGF4QyAdZlT6bGKOxDL8UhCq0OetRHk4
+0vDEubUziTlGe4JZvVguMEcvQDUtKts2WOhKGzZFrq2+15q4dxLWz31H/kFHhJzn
+TCK0svoSWceNnIkoObvHEvK77uEnnN3P+7/M9j6zwEAKVtQlt2nRpWvsXP09peSX
+G/2X79hpnMVSqPl5g6Ff1YeFOHp5Q92xgQIDAQAB
+-----END RSA PUBLIC KEY-----
+Ed25519PublicKey = e5a63KazrjKCO40YdLo2IF0YZ+f6CISTdrkO8jlzaKM
--- a/5
+++ b/5
@ -0,0 +1,5 @@
+berlin2
+darmstadt2
+luebeck2
+trier1
+hamburg03
--- a/scripts/check
+++ b/scripts/check
@ -0,0 +1,197 @@
+#!/usr/bin/env python
+
+import sys
+import os
+import socket
+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(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):
+    try:
+        return socket.getaddrinfo(hostname, port)
+    except Exception:
+        error("DNS Lookup for {hostname} failed".format(hostname=hostname))
+        return []
+
+
+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:
+        process_name = 'ping6'
+    child = subprocess.Popen([process_name, host, '-c', '1', '-W', '5'],
+                             stdout=subprocess.PIPE)
+    child.communicate()
+    if child.returncode:
+        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]
+
+    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':
+        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
+
+
+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:
+                        (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', 'ed25519publickey'):
+                            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):
+    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
+
+            # dns lookup
+            records = check_host_lookup(host, port)
+            if not records:
+                errcnt += 1
+            else:
+                for record in records:
+                    if record[1] is not socket.SOCK_DGRAM:
+                        # vpn connections are udp based, so skip
+                        # everything else
+                        continue
+
+                    if not check_icmp_reachability(record):
+                        errcnt += 1
+                    else:
+                        port_state = check_udp_reachability(record)
+                        if not port_state:
+                            errcnt += 1
+
+    print("\nfound {}/{} working ipv4/ipv6 peers".format(ip4, ip6))
+
+    error("{} errors".format(errcnt))
+    warn("{} warnings".format(warncnt))
+
+    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)
--- a/scripts/gentinc.cfg.sample
+++ b/scripts/gentinc.cfg.sample
@ -1,8 +0,0 @@
-SVN_DIR="/mnt/data/freifunk-icvpn"
-TMP="/tmp"
-TINC_DIR="/etc/tinc/icvpn"
-TINC_INIT="/etc/init.d/tinc"
-SVN="/usr/bin/svn"
-LOCKDIR="/var/run/gentinccfg"
-SVN_USERNAME=freifunk
-SVN_PASSWORD=freifunk
--- a/scripts/gentinccfg
+++ b/scripts/gentinccfg
@ -1,104 +0,0 @@
-#!/bin/bash
-#
-#==========================================================================
-#  This program is free software; you can redistribute it and/or modify 
-#  it under the terms of the GNU General Public License as published by 
-#  the Free Software Foundation; either version 2 of the License, or    
-#  (at your option) any later version.                                  
-#==========================================================================
-#
-set -ix
-# HOW TO USE
-# * Check out the icvpn svn tree to the place where $SVN_DIR points to.
-#   You can do this by running:
-#   mkdir -p /mnt/data
-#   svn co https://kdserv.dyndns.org/svn/christof-icvpn icvpn
-#   Use "freifunk" as username as well as password.
-# * create a /etc/gentinc.cfg file with the following content (remove 
-#   the # signs in the beginning of each line containing a variable) 
-#   and adapt the paths to your system:
-#	# ====== START OF gentinc.cfg ======
-#	# this points to the directory where you checked out the svn tree.
-# 	SVN_DIR="/mnt/data/icvpn"
-# 	TMP="/tmp"
-# 	TINC_DIR="/etc/tinc/icvpn"
-# 	TINC_INIT="/etc/init.d/tinc"
-# 	SVN="/usr/bin/svn"
-# 	LOCKDIR="/var/run/gentinccfg"
-#	SVN_USERNAME=freifunk
-#	SVN_PASSWORD=freifunk
-#	# ====== END OF gentinc.cfg =========
-# * make /etc/gentinc.cfg world readable
-# * run the script from cron on a daily basis
-
-! [[ -f /etc/gentinc.cfg ]] && {
-	echo "config file does not exist in /etc/gentinc.cfg"
-	exit 1
-}
-. /etc/gentinc.cfg
-cleanup() {
-	local exitcode
-	local i
-	exitcode=$1
-	for ((i=0;i<${#TMPFILES[@]};i++))
-	do
-		rm -f ${TMPFILES[i]}
-	done
-	[[ ! $exitcode -eq 0 ]] && 
-		echo "aborted due to error" >&2
-	trap - 1 2 3 6 9 13 14 15
-	rm -f "${LOCKDIR}/PID"
-	rm -rf "${LOCKDIR}"
-	exit ${exitcode:-1}
-}
-
-# obtain lock
-lcount=0
-while ! ( $(mkdir ${LOCKDIR} 2>/dev/null) ) 
-do
-	echo there is already an instance of $0 running as PID: $(cat "${LOCKDIR}/PID" 2>/dev/null)
-	sleep 1
-   ((lcount+=1))
-    if [[ $lcount -gt 4000 ]]
-    then
-      echo unable to obtain lock
-      exit 1
-    fi  
-done
-trap 'cleanup 1' 1 2 3 6 9 13 14 15
-
-# lock obtained
-echo $$ > "${LOCKDIR}/PID"
-
-# make sure we do not overload svn server when running the script from cron
-if [[ $1 != "--nocron" ]]
-then
-	sleep $((RANDOM%3600))
-fi
-
-# create new tinc config
-cd "$SVN_DIR"
-$SVN up --no-auth-cache --username $SVN_USERNAME --password $SVN_PASSWORD >/dev/null
-if [[ $? -gt 0 ]]
-then
-	echo svn update failed - no reload necessary >&2
-	cleanup 2
-fi
-footer=$(mktemp "$TMP/tinc_footer.XXXXXX")
-TMPFILES[${#TMPFILES[@]}]="$footer"
-header=$(mktemp "$TMP/tinc_footer.XXXXXX")
-TMPFILES[${#TMPFILES[@]}]="$header"
-
-for i in ${SVN_DIR}/hosts/*
-do
-	echo "ConnectTo = $(basename $i)" >> "$footer"
-done
-
-grep -v "ConnectTo" "$TINC_DIR/tinc.conf" > "$header"
-cat $header $footer >"$TINC_DIR/tinc.conf"
-
-# exit
-$TINC_INIT reload >/dev/null
-
-cleanup 0
-
--- 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
@ -18,13 +20,18 @@ 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 -q '^Address' -- "$HOST" || continue
+  grep -iq '^Address' -- hosts/"$HOST" || continue

-  echo "ConnectTo = ${HOST##*/}" >> $TINCCFG
-done
+  echo "ConnectTo = $HOST" >> $TINCCFG
+done < metanodes

+if hash tinc 2>/dev/null; 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
Author	SHA1	Message	Date
ohrensessel	a458ad4f5c	camp2015: remove	2015-08-18 12:19:59 +02:00
Kai 'wusel' Siering	a85ab9defe	Merge pull request #115 from ffgtso/master Wiped guetersloh1	2015-08-18 00:01:53 +02:00
Kai 'wusel' Siering	b7a381084d	Wiped guetersloh1	2015-08-17 23:54:53 +02:00
Kai 'wusel' Siering	fc88cb3234	Merge pull request #114 from ffgtso/master New servers, new keys	2015-08-17 23:53:57 +02:00
Kai 'wusel' Siering	46a733b2f7	New servers, new keys	2015-08-17 23:41:37 +02:00
Martin Weinelt	c702465323	augsburg2: remove ecdsa public key, we don't use those	2015-08-17 21:55:32 +02:00
Martin Weinelt	81c40c04b5	monitoringmoehne: add address	2015-08-17 21:46:42 +02:00
Ranlvor	a09516c6bd	Housekeeping Removed hosts that we haven't seen a proper reaction for in the last 6 months. Reference-Builds: 40, 60, 81, 100, 120, 129	2015-08-17 21:32:05 +02:00
Ranlvor	40f90e1a69	Merge pull request #113 from lemoer/master Added address and ec25519 key to hannover1.	2015-08-17 15:13:03 +02:00
lemoer	cf38007f6f	Added address and ec25519 key to hannover1.	2015-08-13 15:05:31 +02:00
lemoer	a45013fc16	Merge pull request #1 from freifunk/master fast forward	2015-08-13 04:13:37 +02:00
Ranlvor	9c8084084b	Merge pull request #112 from lemoer/icvpn	2015-08-11 02:30:30 +02:00
Ranlvor	6191078328	Added time for hannover1 to expire if no adress is added	2015-08-11 02:28:37 +02:00
lemoer	b9fa10de5a	Added host hannover1.	2015-08-11 00:45:48 +02:00
hexa-	86c5df234a	Merge pull request #111 from freifunkhamburg/addcamp add gateway for freifunk SSID on chaos communication camp	2015-08-09 02:37:48 +02:00
ohrensessel	4b26be450d	camp: remove port entry	2015-08-09 02:30:14 +02:00
ohrensessel	6325ab71c1	add gateway for freifunk SSID on chaos communication camp	2015-08-09 02:16:38 +02:00
hexa-	92ea2f92e7	Merge pull request #110 from Zaunei/patch-1 Update westpfalz1-3	2015-08-07 18:28:12 +02:00
Zaunei	3454c05035	Update westpfalz1	2015-08-07 18:23:14 +02:00
Zaunei	41ac21ab62	Update westpfalz2	2015-08-07 18:22:50 +02:00
Zaunei	a099a2af4e	Create westpfalz3	2015-08-07 18:22:01 +02:00
Martin Weinelt	af3593590e	fix regression in last commit	2015-08-07 16:00:52 +02:00
Martin Weinelt	41c67d6c81	post-merge: hide stderr, when tinc cli is not found	2015-08-07 15:54:00 +02:00
Martin Weinelt	b4b204ad41	remove obviously inactive tinc hosts, that... a) have never been seen by tinc on darmstadt2 (metanode) b) have not had an active address in month c) have become inactive	2015-08-05 04:46:28 +02:00
Ranlvor	a7b7f38699	Merge pull request #109 from anon6789/patch-1 add vpn05.bremen.freifunk.net	2015-08-04 21:41:13 +02:00
anon6789	4c6a3ddff7	add vpn05.bremen.freifunk.net	2015-08-04 21:35:57 +02:00
hexa-	248cd5aa06	Merge pull request #108 from kaleng/master Delete koeln1	2015-08-03 01:49:41 +02:00
kaleng	ea7fc83156	Delete koeln1 No maintainer available.	2015-08-03 01:48:22 +02:00
Martin Weinelt	566b212f74	check: ignore ed25519publickey keys	2015-08-03 01:08:27 +02:00
hexa-	a2d2208029	Merge pull request #107 from marvin/master added waldheim2	2015-08-03 00:41:19 +02:00
david noelte	e5d0c78b01	added waldheim2	2015-08-03 00:11:53 +02:00
Ranlvor	96111ab723	Merge pull request #105 from FreifunkUE/patch-1 Create uelzen1	2015-07-31 22:00:51 +02:00
Ranlvor	8b46ff9428	Merge pull request #106 from marvin/master added waldheim1	2015-07-31 22:00:04 +02:00
david noelte	6c9e7b0a55	added waldheim1	2015-07-31 21:09:24 +02:00
Freifunk Uelzen	413eeba462	Create uelzen1	2015-07-25 14:15:31 +02:00
hexa-	60fbd119d5	Merge pull request #104 from wusel42/master New keys for bgp1.guetersloh.freifunk.net	2015-07-17 18:15:42 +02:00
Kai 'wusel' Siering	4b4dff9788	New keys for gueterslohbgp1	2015-07-17 18:04:26 +02:00
Kai 'wusel' Siering	da4c03843a	Merge pull request #1 from freifunk/master Update my repo	2015-07-17 18:02:26 +02:00
Kai 'wusel' Siering	e22c76a482	Revert "New keys". Should have been a pull request, sorry. This reverts commit `fc7b26d657`.	2015-07-17 17:54:26 +02:00
Kai 'wusel' Siering	fc7b26d657	New keys	2015-07-17 17:50:13 +02:00
hexa-	3e16684881	Merge pull request #103 from reissmann/patch-1 Changed key for fulda1	2015-07-15 22:26:27 +02:00
Sven Reissmann	503887d06f	Changed key for fulda1	2015-07-15 22:25:09 +02:00
hexa-	0a46d3d280	Merge pull request #102 from ffbs/master changed icvpn gateway	2015-07-08 11:27:41 +02:00
Georg von Zengen	c15fe1d5aa	changed icvpn gateway	2015-07-07 21:59:14 +02:00
Thomas	c64df2ba05	Merge pull request #101 from plumpudding/master add gl2	2015-07-05 13:35:46 +02:00
root	cb695a88f2	add gl2	2015-07-05 13:03:37 +02:00
hexa-	d8a140bddb	Merge pull request #100 from FFMee/master added meerane1	2015-07-03 00:04:27 +02:00
FFMee	35d1c7da54	a new friend for the cloud	2015-07-02 23:40:49 +02:00
FFMee	136bf6f61d	fixed typo	2015-07-02 23:31:51 +02:00
Martin Weinelt	4b7ee4a595	darmstadt2: add ed25519 public key	2015-06-27 23:33:44 +02:00
hexa-	010364cf21	Merge pull request #99 from FreifunkHalle/master update halle hostnames	2015-06-16 22:22:29 +02:00
Matthias	065cd5ddf2	update halle hostnames	2015-06-16 22:20:56 +02:00
hexa-	3c567e25fb	Merge pull request #98 from prisma01/master Added mainz1	2015-06-16 22:14:34 +02:00
wasserfloh	200f9c03a2	Added mainz1	2015-06-16 21:29:46 +02:00
hexa-	9f20104db9	Merge pull request #97 from ff3l/master Remove dreilaendereck3	2015-05-24 15:05:01 +02:00
srauscher	4e2a0284f7	Remove dreilaendereck3	2015-05-24 14:55:54 +02:00
hexa-	c7f63d43b5	Merge pull request #96 from ffharz/patch-1 Add first gateway for Freifunk Harz	2015-05-23 13:42:51 +02:00
Freifunk Harz	66cccc5395	Add first gateway for Freifunk Harz	2015-05-23 13:29:23 +02:00
Martin Weinelt	6e1a4677b1	remove diac24	2015-05-22 18:29:54 +02:00
hexa-	902b978604	Merge pull request #95 from bodems/master removed bielefeld4, added bielefeld6	2015-05-21 20:04:54 +02:00
bodems	e0daaa7f41	added bielefeld6	2015-05-21 17:50:54 +00:00
bodems	abbc54eeb7	removed bielefeld4	2015-05-21 17:50:37 +00:00
hexa-	b03bf05a66	Merge pull request #94 from Freifunk-Troisdorf/master Added Server Adress for Troisdorf1	2015-05-21 02:25:21 +02:00
hexa-	5423a4eee9	Merge pull request #93 from RubenKelevra/patch-1 add nrw1, change domain for nrw2	2015-05-21 02:25:07 +02:00
root	6c49915b36	Added Server Adress for Troisdorf1	2015-05-20 23:49:09 +02:00
@RubenKelevra	c8790b51d7	update nrw2 address	2015-05-20 21:10:45 +02:00
@RubenKelevra	7b563eccd4	add nrw1	2015-05-20 21:10:01 +02:00
hexa-	12ef1a7a50	Merge pull request #92 from elberfeld/master Neuer Host Freifunk Münsterland	2015-05-15 22:58:11 +02:00
Christian Elberfeld	02c53cf696	eintrag mit hostname	2015-05-15 22:53:41 +02:00
hexa-	e3b2d6f08d	Merge pull request #91 from freifunk-fulda/master FFFD: Added fulda1 tinc VPN	2015-05-15 21:46:48 +02:00
Christian Elberfeld	0f0eeac818	Neuer Host Freifunk Münsterland	2015-05-15 21:17:42 +02:00
Ronny Trommer	c3a61f8fbc	FFFD: Added fulda1 tinc VPN - Added tinc gw03.freifunk-fulda.de VPN endpoint	2015-05-15 21:09:30 +02:00
hexa-	93040b7764	Merge pull request #90 from freifunk-westkueste/master Add Westkueste	2015-05-15 12:12:01 +02:00
olliff	e9383fcbe5	local community freifunk westkueste added	2015-05-15 06:24:33 +02:00
hexa-	ed3af07f07	Merge pull request #89 from cbricart/master it's icvpn.NODES.freifunk-aachen.de .. (fscking Wildcard-DNS resolving..)	2015-05-11 18:43:23 +02:00
Christian Bricart	b78523fb07	it is icvpn.NODES.freifunk-aachen.de .. fscking Wildcard DNS..	2015-05-11 18:40:34 +02:00
Martin Weinelt	f46ef57b5e	post-merge: prefer the tinc1.1 cli over invoke-rc.d if it exists	2015-05-11 15:15:14 +02:00
hexa-	b3911b1d77	Merge pull request #88 from cbricart/master Add aachen1	2015-05-11 14:52:27 +02:00
Christian Bricart	94fbbefb0b	add host aachen1	2015-05-11 14:36:16 +02:00
hexa-	636690a6c2	Merge pull request #87 from ff3l/master Add host dreilaendereck4	2015-05-07 14:54:02 +02:00
Stefan Rauscher	69910ab0e4	Add host dreilaendereck4	2015-05-07 14:45:11 +02:00
hexa-	1bb4681ac0	Merge pull request #86 from freifunkks/master kassel: add kassel1, kassel3	2015-04-28 11:35:34 +02:00
Philipp Hirsch	e107531586	add host kassel1	2015-04-28 11:27:05 +02:00
Philipp Hirsch	f1f82e67c2	Add host kassel3	2015-04-28 10:44:22 +02:00
Martin Weinelt	8088eadc9c	darmstadt: reenable dual-stack for darmstadt1	2015-04-23 22:44:40 +02:00
hexa-	c3c9a8cf23	Merge pull request #85 from freifunkhamburg/hh_master metanodes: add hamburg03	2015-04-20 09:44:18 +02:00
hexa-	c4429d4614	Merge pull request #84 from freifunkhamburg/update_hh hamburg: update ports	2015-04-20 09:44:05 +02:00
ohrensessel	78695a245e	metanodes: add hamburg03 as discussed	2015-04-20 09:31:16 +02:00
ohrensessel	5f3104f10b	hamburg: remove Port= lines, make hamburg02 reachable again	2015-04-20 09:29:01 +02:00
Martin Weinelt	9c556a0ea0	Merge branch 'master' of github.com:freifunk/icvpn	2015-04-18 16:58:20 +02:00
Martin Weinelt	98d313a675	darmstadt: reenable dual-stack with tinc1.1	2015-04-18 16:57:24 +02:00
hexa-	51582c3185	README.md: fix formatting	2015-04-18 16:43:09 +02:00
Martin Weinelt	e3247d7cb5	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.	2015-04-18 16:34:39 +02:00
hexa-	d3d10aad94	Merge pull request #83 from joerg-d/patch-1 Create gw1 of gera-greiz	2015-04-16 08:41:09 +02:00
joerg-d	c455a29485	Create gw1 of gera-greiz	2015-04-16 08:38:22 +02:00
Martin Weinelt	0dc1fc7be3	post-merge: allow case-insensitive address parameter in host config	2015-04-13 02:35:52 +02:00
hexa-	0b0e68172c	Merge pull request #82 from dracoTrier/master Add trier2	2015-04-11 11:01:36 +02:00
dracoTrier	b890378640	Add trier2	2015-04-11 01:15:04 +02:00
hexa-	deb017d1cc	Merge pull request #81 from SteffenDE/patch-1 Delete ehingen1, community is inactive	2015-04-07 13:49:13 +02:00
Steffen	6d59fed131	Delete ehingen1 Freifunk Ehingen ist nicht mehr aktiv.	2015-04-07 13:42:42 +02:00
hexa-	ed794d5c1d	Merge pull request #80 from 020wireless/upstream Adding amsterdam node	2015-03-26 17:57:00 +01:00
020 Wireless	5652fb4a35	Adding amsterdam node	2015-03-26 16:54:25 +00:00
Jan-Philipp Litza	fa01d20915	Add bremen3 (again)	2015-03-23 18:27:14 +01:00
Jan-Philipp Litza	1dfac5a953	Rename bremen3 -> bremen1	2015-03-23 15:41:43 +01:00
Martin Weinelt	6fe2c14976	check: be more verbose	2015-03-22 17:57:14 +01:00
Martin Weinelt	7e72c4403f	darmstadt: update to ipv4 only hostnames for now	2015-03-22 17:10:02 +01:00
hexa-	bc2d938de9	Merge pull request #78 from paalsteek/master add westpfalz2	2015-03-21 23:14:21 +01:00
paalsteek	3d07e86489	add westpfalz2	2015-03-21 23:10:03 +01:00
root-user	65fa913eab	Add bremen3	2015-03-21 16:44:43 +01:00
Martin Weinelt	17b07bf03e	Update darmstadt1, darmstadt2	2015-03-15 01:33:38 +01:00
hexa-	69fca14a16	Merge pull request #77 from bodems/master removed bielefeld2 and added bielefeld4	2015-03-15 01:32:06 +01:00
bodems	732d013b39	removed bielefeld2	2015-03-14 19:47:14 +00:00
bodems	92b783e197	added bielefeld4	2015-03-14 19:46:52 +00:00
hexa-	42055e6f1c	Merge pull request #76 from do9xe/master Update Kiel to the present state	2015-02-24 22:33:31 +01:00
hexa-	f27740a8ed	Merge pull request #75 from Ranlvor/master Added key for trier1	2015-02-24 22:25:23 +01:00
do9xe	4ffd0818a7	delete kiel3, add kiel4	2015-02-24 22:14:55 +01:00
do9xe	e0b61477b9	this key got lost	2015-02-24 22:13:46 +01:00
Kevin Kirsch	b39f9a6709	Added key for trier1	2015-02-24 19:23:34 +01:00
hexa-	230e193c21	Merge pull request #74 from sargon/master post-merge: Use absolute path for invoke-rc.d.	2015-02-18 10:51:41 +01:00
Daniel Ehlers	c430991d41	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.	2015-02-18 10:14:38 +01:00
hexa-	733c614ded	Frankfurt1 to lowercase, for sort order	2015-02-17 17:26:47 +01:00
hexa-	15110d70ea	Merge branch 'master' of github.com:freifunk/icvpn	2015-02-17 17:13:32 +01:00
hexa-	52013714c9	check: udp port reachability through nmap, pass getaddressinfo records where possible	2015-02-17 17:04:19 +01:00
hexa-	0613919bed	README.md: Travis-CI state	2015-02-12 18:39:05 +01:00
hexa-	423c038a49	Housekeeping: Remove hosts that were not updated after being disabled in 2014/08 and are still unreachable	2015-02-12 18:12:29 +01:00
Manuel Munz	19b11aed54	remove static ip address	2015-02-10 23:43:04 +01:00
Martin Weinelt	d797bf27a3	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. `954cf0da5a`) Details will follow on the icvpn mailing list.	2015-02-07 01:27:51 +01:00
Martin Weinelt	6eca4fa2bf	erfurt2: fix address key typo	2015-02-06 22:54:16 +01:00
FreifunkUFO	92dcb88c96	Merge pull request #73 from suicider/master Erfurt2 added	2015-02-06 22:05:37 +01:00
suicider	fd06115a8b	Create erfurt2	2015-02-06 21:47:58 +01:00
suicider	68e4027ddc	Merge pull request #1 from freifunk/master local repository update	2015-02-06 21:46:49 +01:00
hexa-	0fb677ed45	Merge pull request #72 from freifunkhamburg/addhamburg01 added hamburg01	2015-02-06 19:30:54 +01:00
ohrensessel	14b3a2910d	added hamburg01	2015-02-06 19:17:02 +01:00
hexa-	6b3a7fd554	travis: fix iputils-ping dependency	2015-02-06 06:28:54 +01:00
hexa-	ea4c50f9e2	travis: fix hosts path	2015-02-06 06:25:23 +01:00
hexa-	be42ec4b68	Add .travis.yml, fix executable flag on check script and remove pdb from imports	2015-02-06 06:21:52 +01:00
Martin Weinelt	5dbe872abf	Add simple check script: - check dns forward lookups - check reachability via icmpv4/icmpv6 echo request	2015-02-06 06:15:17 +01:00
Thomas	224cc5606c	Merge pull request #71 from thomasDOTde/master added 103.freifunk-moehne.de for community moehne	2015-02-03 20:38:32 +01:00
thomasDOTde	6a65b62e37	added 003.freifunk-moehne.de	2015-02-03 12:18:59 +01:00
thomasDOTde	61743d7acd	added 103.freifunk-moehne.de	2015-02-01 02:06:50 +01:00
Thomas	00f4222e7a	Merge pull request #1 from freifunk/master Merge Upstream changes	2015-02-01 02:04:51 +01:00
Daniel Paufler	1d8d77d759	Merge pull request #69 from ffgtso/master New key	2015-01-26 19:22:43 +01:00
Daniel Paufler	2188f225ad	Merge pull request #70 from ffka/master karlsruhe2 added	2015-01-26 19:22:30 +01:00
strehi	4c453a1b94	Karlsruhe2 added	2015-01-26 13:33:28 +01:00
Kai 'wusel' Siering	e7f03c384c	New key	2015-01-26 01:32:35 +01:00
Daniel Paufler	23605e7ed2	Merge pull request #67 from ffgtso/master Adding Mueritz1	2015-01-15 21:17:02 +01:00
Kai 'wusel' Siering	3e10988aa6	Adding Mueritz1	2015-01-13 20:00:28 +01:00
Nils Schneider	25750605ff	Merge pull request #65 from freifunkhamburg/remove31c3 remove hamburg 31C3 gateway	2015-01-12 00:15:41 +01:00
Nils Schneider	1c58a02f9f	Merge pull request #66 from hhansen06/master added Community FFDH	2015-01-12 00:15:34 +01:00
hhansen06	e7766f20a1	added Community FFDH	2015-01-11 23:52:50 +01:00
ohrensessel	f15810b52a	remove hamburg 31C3 gateway thank you for a nice congress and a nice freifunk assembly	2015-01-02 13:01:37 +01:00
strehi	fe1438eea5	Merge pull request #1 from freifunk/master Update ffka Fork	2014-12-20 17:40:34 +01:00