Commit graph

236 commits

Author SHA1 Message Date
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 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 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 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
Philipp Hirsch
f1f82e67c2 Add host kassel3 2015-04-28 10:44:22 +02:00
Martin Weinelt
8088eadc9c darmstadt: reenable dual-stack for darmstadt1 2015-04-23 22:44:40 +02:00
hexa-
c3c9a8cf23 Merge pull request from freifunkhamburg/hh_master
metanodes: add hamburg03
2015-04-20 09:44:18 +02:00
hexa-
c4429d4614 Merge pull request from freifunkhamburg/update_hh
hamburg: update ports
2015-04-20 09:44:05 +02:00
ohrensessel
78695a245e metanodes: add hamburg03 as discussed 2015-04-20 09:31:16 +02:00
ohrensessel
5f3104f10b hamburg: remove Port= lines, make hamburg02 reachable again 2015-04-20 09:29:01 +02:00
Martin Weinelt
9c556a0ea0 Merge branch 'master' of github.com:freifunk/icvpn 2015-04-18 16:58:20 +02:00
Martin Weinelt
98d313a675 darmstadt: reenable dual-stack with tinc1.1 2015-04-18 16:57:24 +02:00
hexa-
51582c3185 README.md: fix formatting 2015-04-18 16:43:09 +02:00
Martin Weinelt
e3247d7cb5 Introduce the concept of metanodes
updates the README file, and makes the post-merge script read the
metanodes file instead of the whole hosts/ directory.
2015-04-18 16:34:39 +02:00
hexa-
d3d10aad94 Merge pull request from joerg-d/patch-1
Create gw1 of gera-greiz
2015-04-16 08:41:09 +02:00
joerg-d
c455a29485 Create gw1 of gera-greiz 2015-04-16 08:38:22 +02:00
Martin Weinelt
0dc1fc7be3 post-merge: allow case-insensitive address parameter in host config 2015-04-13 02:35:52 +02:00
hexa-
0b0e68172c Merge pull request from dracoTrier/master
Add trier2
2015-04-11 11:01:36 +02:00
dracoTrier
b890378640 Add trier2 2015-04-11 01:15:04 +02:00
hexa-
deb017d1cc Merge pull request from SteffenDE/patch-1
Delete ehingen1, community is inactive
2015-04-07 13:49:13 +02:00
Steffen
6d59fed131 Delete ehingen1
Freifunk Ehingen ist nicht mehr aktiv.
2015-04-07 13:42:42 +02:00
hexa-
ed794d5c1d Merge pull request from 020wireless/upstream
Adding amsterdam node
2015-03-26 17:57:00 +01:00
020 Wireless
5652fb4a35 Adding amsterdam node 2015-03-26 16:54:25 +00:00
Jan-Philipp Litza
fa01d20915 Add bremen3 (again) 2015-03-23 18:27:14 +01:00
Jan-Philipp Litza
1dfac5a953 Rename bremen3 -> bremen1 2015-03-23 15:41:43 +01:00
Martin Weinelt
6fe2c14976 check: be more verbose 2015-03-22 17:57:14 +01:00
Martin Weinelt
7e72c4403f darmstadt: update to ipv4 only hostnames for now 2015-03-22 17:10:02 +01:00
hexa-
bc2d938de9 Merge pull request from paalsteek/master
add westpfalz2
2015-03-21 23:14:21 +01:00
paalsteek
3d07e86489 add westpfalz2 2015-03-21 23:10:03 +01:00
root-user
65fa913eab Add bremen3 2015-03-21 16:44:43 +01:00
Martin Weinelt
17b07bf03e Update darmstadt1, darmstadt2 2015-03-15 01:33:38 +01:00
hexa-
69fca14a16 Merge pull request from bodems/master
removed bielefeld2 and added bielefeld4
2015-03-15 01:32:06 +01:00
bodems
732d013b39 removed bielefeld2 2015-03-14 19:47:14 +00:00
bodems
92b783e197 added bielefeld4 2015-03-14 19:46:52 +00:00
hexa-
42055e6f1c Merge pull request from do9xe/master
Update Kiel to the present state
2015-02-24 22:33:31 +01:00
hexa-
f27740a8ed Merge pull request from Ranlvor/master
Added key for trier1
2015-02-24 22:25:23 +01:00
do9xe
4ffd0818a7 delete kiel3, add kiel4 2015-02-24 22:14:55 +01:00
do9xe
e0b61477b9 this key got lost 2015-02-24 22:13:46 +01:00
Kevin Kirsch
b39f9a6709
Added key for trier1 2015-02-24 19:23:34 +01:00
hexa-
230e193c21 Merge pull request from sargon/master
post-merge: Use absolute path for invoke-rc.d.
2015-02-18 10:51:41 +01:00
Daniel Ehlers
c430991d41 post-merge: Use absolute path for invoke-rc.d.
When the hook is triggered due to an cron job, the path may
not contain "/usr/sbin/" and thus the daemon reload is not happening.
2015-02-18 10:14:38 +01:00
hexa-
733c614ded Frankfurt1 to lowercase, for sort order 2015-02-17 17:26:47 +01:00
hexa-
15110d70ea Merge branch 'master' of github.com:freifunk/icvpn 2015-02-17 17:13:32 +01:00
hexa-
52013714c9 check: udp port reachability through nmap, pass getaddressinfo records where possible 2015-02-17 17:04:19 +01:00
hexa-
0613919bed README.md: Travis-CI state 2015-02-12 18:39:05 +01:00
hexa-
423c038a49 Housekeeping: Remove hosts that were not updated after being disabled in 2014/08 and are still unreachable 2015-02-12 18:12:29 +01:00
Manuel Munz
19b11aed54 remove static ip address 2015-02-10 23:43:04 +01:00