Commit graph

302 commits

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