Merge remote-tracking branch 'origin/stable' into altdorf

Merging Ffmuc v2015.5 stable to altdorf branch

Conflicts:
	CHANGELOG.md

CHANGELOG.md

@@ -1,11 +1,19 @@
 # Freifunk München Firmware Changelog
 
-## v2015.4-altdorf
+## v2015.5-altdorf
- - Added additional Autoupdate Server
+ - Added additional Autoupdate Server for altdorf
- - Added additional Autoupdate Signatures
+ - Added additional Autoupdate Signatures for altdorf
  - Made changes necessary for Altdorf in i18n folder
 
-## v2015.4
+## v2015.5
+ - Updated to Gluon 2015.1.1
+   - Fixes some problems with mesh on LAN setups
+ - x86 images now support two network interfaces, eth0 for LAN and eth1 for WAN
+ - Mesh on WAN is disabled by default
+ - VPN connection limit was decreased from 2 to 1 to divide the broadcast traffic
+   into half and take unnecessary load from overloaded gateways
+
+## v2015.4 [never released]
  - Updated to Gluon 2015.1
    - More supported architectures and router models are available, including x86
  - Setup Mode

Makefile

@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git
+GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 620f01f513012757a66d782ef0e930245fcdc1e8
+GLUON_GIT_REF := v2015.1.1
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
@@ -47,7 +47,10 @@ ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
 
 gluon-prepare: images-clean ${GLUON_BUILD_DIR}
-	(cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF})
+	(cd ${GLUON_BUILD_DIR} \
+	  && git remote set-url origin ${GLUON_GIT_URL} \
+	  && git fetch origin \
+	  && git checkout -q ${GLUON_GIT_REF})
 	ln -sfT .. ${GLUON_BUILD_DIR}/site
 	${GLUON_MAKE} update
 

site.conf

@@ -10,7 +10,7 @@
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
 
-  mesh_on_wan = true,
+  mesh_on_wan = false,
 
   regdom = 'DE',
 
@@ -43,15 +43,8 @@
     mtu = 1426,
     groups = {
       backbone = {
-      limit = 2,
+      limit = 1,
         peers = {
-          gw02 = {   --[[ mephisto ]]
-            key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0',
-            remotes = {
-              'ipv4 "gw02.ffmuc.net" port 10000',
-              'ipv4 "gw02.freifunk-muenchen.de" port 10000',
-            },
-          },
           gw03 = {   --[[ fpletz ]]
             key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
             remotes = {