Commit graph

279 commits

Author SHA1 Message Date
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
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