Commit graph

133 commits

Author SHA1 Message Date
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
knirps99 32cc727d67 Update mainz1
change ip to domain
2014-10-25 19:09:30 +02:00
knirps99 48fa2bc453 Update mainz2
Add right address vor mainz2
2014-10-25 19:07:17 +02:00
BenJule c74c831976 Added Gateway3 of Freifunk-3Laendereck 2014-10-22 19:30:49 +02:00
Manuel Munz 15bf69b14e Merge pull request #40 from Pepto/patch-1
Create dreilaendereck2
2014-10-21 20:41:03 +02:00
Pepto ad1a2b0445 Create dreilaendereck2
dreilaendereck gw2 added
2014-10-21 14:55:34 +02:00
Manuel Munz 020de5908d Merge pull request #37 from lephisto/master
muenchen4 added - pubkey for muenchen1 changed
2014-10-08 15:34:56 +02:00
Manuel Munz 09682f5023 Merge pull request #38 from suicider/master
Create erfurt1
2014-10-08 15:33:43 +02:00
root a288d1f92d key changed to match real muenchen1 2014-10-08 15:24:09 +02:00
suicider 4259006695 Create erfurt1 2014-10-08 13:09:31 +02:00
root 372e5b73aa muenchen4 added 2014-10-08 12:55:09 +02:00
Manuel Munz 6ca1adf22b Merge pull request #36 from lephisto/master
muenchen added
2014-10-08 11:16:11 +02:00
root 4dcba5ca73 muenchen added 2014-10-08 11:10:51 +02:00
Nils Schneider f6197e9df2 Merge pull request #29 from jplitza/master
removed aurich
2014-09-20 22:11:29 +02:00
Nils Schneider d775647d13 Merge pull request #35 from ffbs/master
add braunschweig[12]
2014-09-20 22:11:10 +02:00
Jan Luebbe d31c8d7ffc add braunschweig[12] 2014-09-20 20:19:50 +02:00
Daniel Paufler c2779d388a Merge pull request #34 from sargon/master
kiel: Remove kiel1
2014-09-15 08:08:57 +02:00
Daniel Ehlers 137c824d26 kiel: Remove kiel1
The system is no longer acting as a icvpn peer
2014-09-13 23:06:41 +02:00
Nils Schneider 81640df37d Merge branch 'frosty-geek-feature_auto_conf' 2014-09-04 13:29:52 +02:00
Nils Schneider b2f40d0a76 refactor post-merge hook 2014-09-04 13:29:31 +02:00
Nils Schneider 721beeb745 Merge pull request #33 from freifunk-darmstadt/master
Add darmstadt1/darmstadt2
2014-09-04 08:10:57 +02:00
Christian Roeder ab5e90d556 Merge remote-tracking branch 'ffda/master' 2014-09-03 23:57:46 +02:00
Martin Weinelt 730096b44a Added darmstadt2 2014-09-03 23:56:58 +02:00
Christian Roeder 0c43a633e8 add darmstadt1 2014-09-03 23:52:54 +02:00
Ralf Heiringhoff 579794152f rewrite post-merge to auto-generate tinc config 2014-09-03 15:06:59 +02:00