Commit graph

  • 9ca1e595e2 Merge pull request #41 from BenJule/patch-2 Nils Schneider 2014-10-26 16:01:46 +0100
  • c7e99c1830 generic FQDN for mainz2 ka-ba 2014-10-26 14:06:22 +0100
  • a0300bc170 change Wiesbaden addresses to FQDN instead IPs ka-ba 2014-10-26 02:38:31 +0200
  • eed1c1aead main1 will be wiesbaden2 from now on ka-ba 2014-10-26 02:29:43 +0200
  • 95074b6ef2 Merge branch 'master' of https://github.com/freifunk/icvpn ka-ba 2014-10-26 02:18:38 +0200
  • 32cc727d67 Update mainz1 knirps99 2014-10-25 19:09:30 +0200
  • 48fa2bc453 Update mainz2 knirps99 2014-10-25 19:07:17 +0200
  • c74c831976 Added Gateway3 of Freifunk-3Laendereck BenJule 2014-10-22 19:30:49 +0200
  • 15bf69b14e Merge pull request #40 from Pepto/patch-1 Manuel Munz 2014-10-21 20:41:03 +0200
  • ad1a2b0445 Create dreilaendereck2 Pepto 2014-10-21 14:55:34 +0200
  • 020de5908d Merge pull request #37 from lephisto/master Manuel Munz 2014-10-08 15:34:56 +0200
  • 09682f5023 Merge pull request #38 from suicider/master Manuel Munz 2014-10-08 15:33:43 +0200
  • a288d1f92d key changed to match real muenchen1 root 2014-10-08 15:24:09 +0200
  • 4259006695 Create erfurt1 suicider 2014-10-08 13:09:31 +0200
  • 372e5b73aa muenchen4 added root 2014-10-08 12:55:09 +0200
  • 6ca1adf22b Merge pull request #36 from lephisto/master Manuel Munz 2014-10-08 11:16:11 +0200
  • 4dcba5ca73 muenchen added root 2014-10-08 11:10:51 +0200
  • f6197e9df2 Merge pull request #29 from jplitza/master Nils Schneider 2014-09-20 22:11:29 +0200
  • d775647d13 Merge pull request #35 from ffbs/master Nils Schneider 2014-09-20 22:11:10 +0200
  • d31c8d7ffc add braunschweig[12] Jan Luebbe 2014-09-20 20:19:50 +0200
  • c2779d388a Merge pull request #34 from sargon/master Daniel Paufler 2014-09-15 08:08:57 +0200
  • 137c824d26 kiel: Remove kiel1 Daniel Ehlers 2014-09-13 23:05:10 +0200
  • 81640df37d Merge branch 'frosty-geek-feature_auto_conf' Nils Schneider 2014-09-04 13:29:52 +0200
  • b2f40d0a76 refactor post-merge hook Nils Schneider 2014-09-04 13:29:31 +0200
  • 721beeb745 Merge pull request #33 from freifunk-darmstadt/master Nils Schneider 2014-09-04 08:10:57 +0200
  • ab5e90d556 Merge remote-tracking branch 'ffda/master' Christian Roeder 2014-09-03 23:57:46 +0200
  • 730096b44a Added darmstadt2 Martin Weinelt 2014-09-03 23:56:58 +0200
  • 0c43a633e8 add darmstadt1 Christian Roeder 2014-09-03 23:52:54 +0200
  • 579794152f rewrite post-merge to auto-generate tinc config Ralf Heiringhoff 2014-09-03 15:06:59 +0200
  • c77eaf7eb7 Merge pull request #31 from sargon/master Nils Schneider 2014-09-01 13:28:24 +0200
  • 002343b971 kiel: Update dynamic domain name Daniel Ehlers 2014-09-01 13:23:43 +0200
  • ed5b0d755b kiel: The private keys of kiel4 are lost. Daniel Ehlers 2014-09-01 13:23:16 +0200
  • 2fefa1a1b0 kiel: Rename kiel2 to kiel3, remove old kiel3. Daniel Ehlers 2014-09-01 13:22:36 +0200
  • fb5735b4f0 removed aurich Jan-Philipp Litza 2014-09-01 12:39:46 +0200
  • b721138aa6 Merge pull request #26 from jplitza/master Daniel Paufler 2014-09-01 09:01:20 +0200
  • 8b70cd48d8 Merge pull request #28 from thomasDOTde/add-key-ffmoehne Nils Schneider 2014-08-31 16:27:05 +0200
  • fff313a48a monitoring-moehne in monitoringmoehne wegen tinc Einschraenkung umbenannt thomasDOTde 2014-08-31 16:24:45 +0200
  • 9254b9b2be Merge pull request #27 from thomasDOTde/add-key-ffmoehne Nils Schneider 2014-08-31 15:21:41 +0200
  • 76d4a5b1bc Key für Monitoring eingefügt Ansprechpartner hallo@freifunk-moehne.de thomasDOTde 2014-08-31 15:00:46 +0200
  • 1ab3d9162f Key fuer Monitoring hinzugefuegt Ansprechpartner thomas@drewermann.org thomasDOTde 2014-08-31 14:56:53 +0200
  • 001efbd180 Key fuer Moehne hinzugefuegt thomasDOTde 2014-08-31 14:25:15 +0200
  • 954cf0da5a Clean up unresolvable peers Jan-Philipp Litza 2014-08-31 13:04:00 +0200
  • c4a7f000d5 Merge pull request #25 from foertel/master Nils Schneider 2014-08-30 19:31:42 +0200
  • e83fe9a444 add key of flensburg2 Felix Oertel 2014-08-30 19:29:28 +0200
  • f9965067c6 Merge pull request #24 from sargon/upstream Daniel Paufler 2014-08-29 08:59:24 +0200
  • 55248bb1d4 Update key of kiel2 Daniel Ehlers 2014-08-28 21:46:27 +0200
  • f68ed21b00 Merge pull request #23 from ffruhr/master Nils Schneider 2014-08-26 14:47:17 +0200
  • 0a596451b5 Update ruhrgebiet1 DaCHRIS 2014-08-26 12:21:02 +0200
  • fb4b6196f9 add ruhrgebiet1 Philip Berndroth 2014-08-26 12:19:29 +0200
  • 3861d4ddc2 Added flensburg1 Nils Schneider 2014-08-23 14:36:52 +0200
  • 3202299063 Merge pull request #22 from ka-ba/master Daniel Paufler 2014-08-22 10:05:36 +0200
  • f4d55cd226 introducing Wiebaden, preparing Mainz to new joint net version (Gluon) ka-ba 2014-08-22 01:16:32 +0200
  • b6fd43cd32 Merge pull request #21 from wusel42/master Daniel Paufler 2014-08-19 16:58:39 +0200
  • 5d7c2009ae New key Kai 'wusel' Siering 2014-08-19 14:55:39 +0200
  • 2d45c2bc3b Added Guetersloh root 2014-08-19 14:39:34 +0200
  • 9b6891bdae Move dreilaendereck1 to hosts dir Nico von Geyso 2014-08-17 23:35:05 +0200
  • c0a2190cae Merge pull request #20 from kalbfuss/patch-3 Daniel Paufler 2014-08-17 20:56:35 +0200
  • 5c4c1db785 Merge pull request #19 from kalbfuss/patch-2 Daniel Paufler 2014-08-17 20:56:21 +0200
  • 5b4c7c00fe Delete configuration file "weil-am-rhein1" kalbfuss 2014-08-16 19:17:41 +0200
  • 116b1e5629 New configuration file "dreilaendereck1" kalbfuss 2014-08-16 19:15:59 +0200
  • 66e0556fc9 Merge pull request #18 from FreifunkMD/master Daniel Paufler 2014-08-06 22:45:52 +0200
  • fd8fa7e463 Added magdeburg1 Andreas Pfohl 2014-08-06 14:06:18 +0200
  • 653ee2b674 Added magdeburg2 Andreas Pfohl 2014-08-06 13:25:36 +0200
  • 947c2fcf93 Merge pull request #17 from sargon/upstream Daniel Paufler 2014-07-29 19:41:16 +0200
  • ebd38dc69a kiel: Rename kiel13 into kiel2 Daniel Ehlers 2014-07-27 11:27:50 +0200
  • 0dc37c43d5 kiel: Add keys for new icvpn peer Daniel Ehlers 2014-07-18 16:26:11 +0200
  • 184c83a811 Merge pull request #16 from fuckup/master Daniel Paufler 2014-07-22 19:27:09 +0200
  • 8db7cd2336 Pubkeys for rheinland0-2 added Oliver Herms 2014-07-21 21:58:12 +0200
  • 1bd1f904f1 Merge pull request #15 from freifunkhamburg/gw03-remove FreifunkUFO 2014-06-26 01:37:29 +0200
  • 22e7621aae Added ostholstein1 Freifunk Ostholstein e.V 2014-06-05 22:05:46 +0200
  • 8971f11a42 Remove hamburg03 ohrensessel 2014-06-05 22:06:04 +0200
  • 3239730751 weimar2: merged root 2014-06-04 21:26:17 +0200
  • 8fa7d0fba2 weimar2: set port root 2014-06-04 21:24:53 +0200
  • 95fa9ca69d Merge pull request #11 from FF-NRW/master Daniel Paufler 2014-06-02 16:13:45 +0200
  • 0126706f80 Merge pull request #14 from Freifunk-Rhein-Neckar/master Daniel Paufler 2014-05-30 15:17:16 +0200
  • 92c30b9bb5 remove not allowed minus char from file name Ben Oswald 2014-05-30 00:30:23 +0200
  • dcf66630f7 add rhein-neckar1 Ben Oswald 2014-05-29 23:08:16 +0200
  • d84bf1c592 port updated for weimar2 Andi 2014-05-10 19:58:24 +0200
  • bb9693c355 Merge pull request #13 from ka-ba/master Daniel Paufler 2014-05-09 11:36:46 +0200
  • c57cffa9c9 added mainz2 ka-ba 2014-05-09 00:39:38 +0200
  • c84b14002a wermelskirchen only-server is obsolete, will be recreated as nrw1 @RubenKelevra 2014-04-19 18:07:18 +0200
  • ec98358822 Merge pull request #9 from freifunk-ffm/master Daniel Paufler 2014-03-14 10:06:40 +0100
  • c14d27e1f7 changed frankfurt port and hostname Christof Schulze 2014-03-14 01:41:59 +0100
  • 7752c2447c Merge pull request #8 from kalbfuss/patch-1 Daniel Paufler 2014-03-10 15:31:32 +0100
  • d189779268 Create weil-am-rhein1 kalbfuss 2014-03-09 17:06:03 +0100
  • cf081cb6b6 Merge pull request #7 from FreifunkBremen/master Daniel Paufler 2014-03-03 08:28:53 +0100
  • 949bd7b1c0 add bremen2 Jan-Philipp Litza 2014-03-01 14:54:50 +0100
  • 927c6889af Merge pull request #6 from FF-NRW/patch-1 Daniel Paufler 2013-12-30 02:15:27 -0800
  • 11535c2d55 add address for second nrw-server Freifunk NRW 2013-12-29 20:50:32 +0100
  • bfe0672c60 add second nrw-server Freifunk NRW 2013-12-29 20:42:08 +0100
  • 52647882c1 updated 2nd vpn server weimar Andi 2013-12-03 12:28:34 +0100
  • bf70ef5e5d update hostname of kiel1 Nils Schneider 2013-11-12 12:05:38 +0100
  • 07f4658c97 Add pubkey for augsburg2 Manuel Munz 2013-11-09 19:46:49 +0100
  • 9e8162ca19 rm kiel2, add kiel13 Nils Schneider 2013-11-07 21:37:06 +0100
  • 6aeaf8e7a7 add .gitignore Nils Schneider 2013-11-07 21:33:59 +0100
  • 1ee5cfb627 Merge pull request #4 from bodems/master FreifunkUFO 2013-10-18 08:01:39 -0700
  • 69e5753e3d added bielefeld2 bodems 2013-10-15 17:46:44 +0000
  • 1599a076f5 scripts: add post-merge sample hook for debian Nils Schneider 2013-10-09 10:48:57 +0200
  • bddf304856 Merge pull request #3 from FreifunkJena/master Nils Schneider 2013-10-09 01:16:15 -0700
  • fa803487d3 remove jena1 - this ic-node doesnt exist anymore Nils Schneider 2013-10-09 10:15:27 +0200