freifunk/icvpn
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
201 commits 10 branches 0 tags 301 KiB
Commit graph

201 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nils Schneider c77eaf7eb7 Merge pull request #31 from sargon/master 
kiel: Cleanup of keys.
 2014-09-01 13:28:24 +02:00
Daniel Ehlers 002343b971 kiel: Update dynamic domain name 2014-09-01 13:23:43 +02:00
Daniel Ehlers ed5b0d755b kiel: The private keys of kiel4 are lost. 
Furthermore the host is no longer available.
 2014-09-01 13:23:16 +02:00
Daniel Ehlers 2fefa1a1b0 kiel: Rename kiel2 to kiel3, remove old kiel3. 
The former Kiel3 host is going to be dropped, since the host known
as kiel2 is locally known as vpn3 it is sound for our numbering scheme
to rename it in this way.
 2014-09-01 13:22:36 +02:00
Jan-Philipp Litza fb5735b4f0 removed aurich 2014-09-01 12:39:46 +02:00
Daniel Paufler b721138aa6 Merge pull request #26 from jplitza/master 
Clean up unresolvable peers
 2014-09-01 09:01:20 +02:00
Nils Schneider 8b70cd48d8 Merge pull request #28 from thomasDOTde/add-key-ffmoehne 
monitoring-moehne in monitoringmoehne wegen tinc Einschraenkung umbenann...
 2014-08-31 16:27:05 +02:00
thomasDOTde fff313a48a monitoring-moehne in monitoringmoehne wegen tinc Einschraenkung umbenannt 2014-08-31 16:24:45 +02:00
Nils Schneider 9254b9b2be Merge pull request #27 from thomasDOTde/add-key-ffmoehne 
Key fuer Moehne hinzugefuegt
 2014-08-31 15:21:41 +02:00
thomasDOTde 76d4a5b1bc Key für Monitoring eingefügt 
Ansprechpartner hallo@freifunk-moehne.de
 2014-08-31 15:00:46 +02:00
thomasDOTde 1ab3d9162f Key fuer Monitoring hinzugefuegt 
Ansprechpartner thomas@drewermann.org
 2014-08-31 14:56:53 +02:00
thomasDOTde 001efbd180 Key fuer Moehne hinzugefuegt 2014-08-31 14:25:15 +02:00
Jan-Philipp Litza 954cf0da5a Clean up unresolvable peers 
Comment out the Address= and Port= lines in the host definitions for
all hosts that aren't resolvable. This causes tinc to not attempt any
outgoing connection even though ConnectTo= is given, but enables them to
connect to us.
 2014-08-31 13:04:00 +02:00
Nils Schneider c4a7f000d5 Merge pull request #25 from foertel/master 
add key of flensburg2
 2014-08-30 19:31:42 +02:00
Felix Oertel e83fe9a444 add key of flensburg2 2014-08-30 19:29:28 +02:00
Daniel Paufler f9965067c6 Merge pull request #24 from sargon/upstream 
Update key of kiel2
 2014-08-29 08:59:24 +02:00
Daniel Ehlers 55248bb1d4 Update key of kiel2 2014-08-28 21:46:27 +02:00
Nils Schneider f68ed21b00 Merge pull request #23 from ffruhr/master 
ruhrgebiet1
 2014-08-26 14:47:17 +02:00
DaCHRIS 0a596451b5 Update ruhrgebiet1 2014-08-26 12:21:02 +02:00
Philip Berndroth fb4b6196f9 add ruhrgebiet1 2014-08-26 12:19:29 +02:00
Nils Schneider 3861d4ddc2 Added flensburg1 2014-08-23 14:36:52 +02:00
Daniel Paufler 3202299063 Merge pull request #22 from ka-ba/master 
introducing Wiebaden, preparing Mainz to new joint net version (Gluon)
 2014-08-22 10:05:36 +02:00
ka-ba f4d55cd226 introducing Wiebaden, preparing Mainz to new joint net version (Gluon) 2014-08-22 01:16:32 +02:00
Daniel Paufler b6fd43cd32 Merge pull request #21 from wusel42/master 
Please add Guetersloh's files
 2014-08-19 16:58:39 +02:00
Kai 'wusel' Siering 5d7c2009ae New key 2014-08-19 14:55:39 +02:00
root 2d45c2bc3b Added Guetersloh 2014-08-19 14:39:34 +02:00
Nico von Geyso 9b6891bdae Move dreilaendereck1 to hosts dir 
@kalbfuss put their config file in the root directory
instead of the hosts dir. This should fix problems mentioned
in #19.
 2014-08-17 23:35:21 +02:00
Daniel Paufler c0a2190cae Merge pull request #20 from kalbfuss/patch-3 
Delete configuration file "weil-am-rhein1"
 2014-08-17 20:56:35 +02:00
Daniel Paufler 5c4c1db785 Merge pull request #19 from kalbfuss/patch-2 
New configuration file "dreilaendereck1"
 2014-08-17 20:56:21 +02:00
kalbfuss 5b4c7c00fe Delete configuration file "weil-am-rhein1" 
Configuration file "weil-am-rhein1" has become obsolete after merger of "Freifunk Weil am Rhein" into meta community "Freifunk Dreiländereck"
 2014-08-16 19:17:41 +02:00
kalbfuss 116b1e5629 New configuration file "dreilaendereck1" 
Configuration file "dreilaendereck1" for first ICVPN-Gateway gw1.freifunk-3laendereck added.
 2014-08-16 19:15:59 +02:00
Daniel Paufler 66e0556fc9 Merge pull request #18 from FreifunkMD/master 
Add Magdeburg
 2014-08-06 22:45:52 +02:00