Merge pull request #39 from LeSpocky/fix-38

bump gluon to 2014.3.1 and default enable mesh vpn
FreifunkMD · Nov 2, 2014 · 409b5dd · 409b5dd
2 parents 1b1734d + cb62cf8
commit 409b5dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -48,6 +48,9 @@ Verify a successful upgrade by
 Gluon versions used for specific Freifunk Magdeburg Firmware builds
 -------------------------------------------------------------------
 
+* 0.30: *gluon 2014.3.1*
+  * see http://gluon.readthedocs.org/en/latest/releases/v2014.3.1.html
+  * enable mesh VPN by default
 * 0.29: *gluon 2014.3*
   * see http://gluon.readthedocs.org/en/latest/releases/v2014.3.html
   * fix #31 (autoupdate per default anschalten)

diff --git a/site.conf b/site.conf
@@ -36,6 +36,7 @@
     },
 
     fastd_mesh_vpn = {
+        enabled = true,
         methods = {'salsa2012+gmac'},
         mtu = 1426,
         backbone = {

diff --git a/site.mk b/site.mk
@@ -20,7 +20,7 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_CHECKOUT := v2014.3
+DEFAULT_GLUON_CHECKOUT := v2014.3.1
 # Allow overriding the checkout from the command line
 GLUON_CHECKOUT ?= $(DEFAULT_GLUON_CHECKOUT)