Commit graph

207 commits

Author SHA1 Message Date
Nils Schneider cc19863875 Merge pull request #61 from nomaster/master
removed Rheinland, added Rheinufer1
2014-12-28 21:18:19 +01:00
Mic a0ceb94cfe removed Rheinland, added Rheinufer1 2014-12-28 21:17:19 +01:00
Nils Schneider 23996cdb26 Merge pull request #60 from elberfeld/master
Erster IC-VPN Host frü Freifunk-Muenster
2014-12-28 21:05:28 +01:00
Nils Schneider 790dce34d6 Merge pull request #58 from freifunkhamburg/removeold
hamburg: remove 05 and 01
2014-12-28 21:03:03 +01:00
Nils Schneider 7da68437d8 Merge pull request #59 from freifunk-goettingen/master
Add pub key goettingen1
2014-12-28 21:02:51 +01:00
Christian Elberfeld a5adeb6900 host muenster1 eingetragen 2014-12-28 21:02:49 +01:00
root 9e81a9d07e Add pub key goettingen1 2014-12-28 20:57:17 +01:00
Nils Schneider 881761be5b scripts/post-merge: fix documentation 2014-12-28 20:45:52 +01:00
ohrensessel 207186fa1b hamburg: remove 05 and 01 2014-12-28 02:35:42 +01:00
Nils Schneider c879c97063 Merge pull request #57 from Barbarossa-/master
Add first gateways of Freifunk Paderborn.
2014-12-27 21:50:16 +01:00
Maximilian Wilhelm 6624a1d4dc Add first gateways of Freifunk Paderborn.
Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2014-12-27 21:36:37 +01:00
Nils Schneider ae9eb51482 Merge pull request #54 from freifunk-ehingen/patch-1
Added first gateway of Freifunk Ehingen
2014-12-26 01:26:53 +01:00
Freifunk Ehingen 4160479b3f Added first gateway of Freifunk Ehingen 2014-12-24 12:36:53 +01:00
FreifunkUFO b5f1465d72 Merge pull request #53 from freifunkhamburg/add-31c3
add hamburg 31c3 icvpn gateway
2014-12-24 03:58:31 +01:00
ohrensessel dff4c086ef add hamburg 31c3 icvpn gateway 2014-12-21 22:36:08 +01:00
Nils Schneider 9b7ee859af Merge pull request #52 from freifunkhamburg/add-hh03
add hamburg03
2014-12-20 18:45:55 +01:00
strehi fe1438eea5 Merge pull request #1 from freifunk/master
Update ffka Fork
2014-12-20 17:40:34 +01:00
ohrensessel 6ff6f5b2d1 add hamburg03 2014-12-20 16:46:40 +01:00
Daniel Paufler 6fae506dba Merge pull request #51 from kerel-fs/master
Update koeln1.
2014-12-09 20:54:07 +01:00
kerel-fs ea782ce326 koeln1: Changed key size properly to 4096. 2014-12-06 22:07:56 +01:00
kerel-fs cc19cc8cf9 koeln1: Changed key size to 4096. 2014-12-06 21:52:34 +01:00
kerel-fs 30418ba68c koeln1: Changed address and key. 2014-12-06 21:25:09 +01:00
FreifunkUFO e7d507808c Merge pull request #50 from xlizard/master
replaced gronau-gateways by nrw3
2014-12-01 23:00:58 +01:00
xlizard 187927850a Create nrw3 2014-12-01 22:16:05 +01:00
xlizard b4ebb88d16 removed gronau2, migrated into nrw 2014-12-01 22:14:58 +01:00
xlizard d9c8fadd7a removed gronau1, migrated into nrw 2014-12-01 22:14:40 +01:00
FreifunkUFO 9c45ef6fe3 Delete grossdraxdorf
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/
2014-11-30 16:55:22 +01:00
FreifunkUFO a8cd065c66 Merge pull request #49 from FreifunkOldenburg/master
rename oldenburg1 to nordwest1, add nordwest2 and nordwest3
2014-11-30 16:44:25 +01:00
Bjoern Franke 042f0b6ef2 add nordwest2 and nordwest3 2014-11-25 19:53:49 +01:00
Bjoern Franke 6dac8e233a rename oldenburg1 to nordwest1 2014-11-25 19:50:26 +01:00
Nils Schneider e5c650a1a6 Merge pull request #48 from freifunkhamburg/add-hh02
Add hamburg02
2014-11-24 13:52:26 +01:00
ohrensessel 49aec26132 Add hamburg02
we would be very happy if a lot of you also peer with this machine
2014-11-24 12:54:59 +01:00
root 526cde9815 added berlin2 2014-11-21 20:29:41 +01:00
Daniel Paufler 9c8d0f08e6 Merge pull request #47 from jplitza/master
Bremen Update
2014-11-21 19:50:53 +01:00
Jan-Philipp Litza 88f4591e26 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.
2014-11-21 01:18:55 +01:00
Jan-Philipp Litza 4e8a3c207e Added bremen1 2014-11-21 00:37:19 +01:00
Daniel Paufler 50479f9eb5 Merge pull request #44 from ffka/master
Karlsruhe1 for ffka added
2014-11-03 21:35:50 +01:00
Daniel Paufler 90d97ad02a Merge pull request #43 from freifunk-mwu/master
fixed syntax:  key start marker for mainz2 was corrupted
2014-11-03 21:35:37 +01:00
Daniel Paufler abc72ab230 Merge pull request #45 from paalsteek/master
Create westpfalz1
2014-11-03 21:35:12 +01:00
Daniel Paufler ae20122d49 Merge pull request #46 from ffgtso/master
Added gueterslohbgp1 & gueterslohbgp2
2014-11-03 21:34:54 +01:00
Kai 'wusel' Siering ce448f41c1 Added gueterslohbgp1 & gueterslohbgp2 2014-10-31 17:54:03 +01:00
paalsteek ace5099354 Create westpfalz1 2014-10-30 23:31:38 +01:00
strehi e874721777 Karlsruhe1 for ffka added 2014-10-26 22:15:44 +01:00
ka-ba 9c39f3bd2e GRRRRR. key start marker for mainz2 got corrupted - fixed 2014-10-26 18:22:21 +01:00
Nils Schneider c1f38f98a4 Merge pull request #42 from freifunk-mwu/master
various improvements for Mainz & Wiesbaden
2014-10-26 16:02:03 +01:00
Nils Schneider 9ca1e595e2 Merge pull request #41 from BenJule/patch-2
Added Gateway3 of Freifunk-3Laendereck
2014-10-26 16:01:46 +01:00
ka-ba c7e99c1830 generic FQDN for mainz2 2014-10-26 14:06:22 +01:00
ka-ba a0300bc170 change Wiesbaden addresses to FQDN instead IPs 2014-10-26 02:38:31 +02:00
ka-ba eed1c1aead main1 will be wiesbaden2 from now on 2014-10-26 02:29:43 +02:00
ka-ba 95074b6ef2 Merge branch 'master' of https://github.com/freifunk/icvpn 2014-10-26 02:18:38 +02:00