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

220 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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