Merge pull request #1 from freifunk/master

Update ffka Fork

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-----

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-----

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-----

hosts/gronau1

@@ -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-----

hosts/gronau2

@@ -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-----
-

hosts/grossdraxdorf

@@ -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-----

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-----

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-----

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-----

hosts/koeln1

@@ -1,15 +1,16 @@
-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==
+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-----

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

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

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-----
+

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-----
+

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-----

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-----