Switch to babel branch from our gluon fork

This reverts commit 3ea1990a14.

Makefile

@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
+GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git
-GLUON_GIT_REF := v2015.1.2
+GLUON_GIT_REF := e05ca52e0359a182b49e0fb44e68f1972aa69016
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
@@ -17,7 +17,9 @@ else
   GLUON_BRANCH := experimental
 endif
 
-GLUON_MAKE := ${MAKE} -C ${GLUON_BUILD_DIR} \
+JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
+
+GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
 			GLUON_BRANCH=${GLUON_BRANCH}
 

site.conf

@@ -1,8 +1,7 @@
 {
   hostname_prefix = '',
   site_name = 'Freifunk München',
-  site_code = 'ffmuc',
+  site_code = 'ffmuc-babel',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
   prefix4 = '10.80.0.0/16',
   prefix6 = 'fdef:ffc0:4fff::/64',
@@ -15,21 +14,41 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
+    channel = 11,
-    channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:17',
+      ssid = 'babel.muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    mesh = {
+      id = 'ffmuc-mesh-babel',
+      mcast_rate = 12000,
+    },
+    ibss = {
+      ssid = 'mesh.ffmuc.babel',
+      bssid = '02:0E:8E:1E:61:10',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 44,
     htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:17',
+      ssid = 'babel.muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    mesh = {
+      id = 'ffmuc-mesh-babel',
+      mcast_rate = 12000,
+    },
+    ibss = {
+      ssid = 'mesh.ffmuc.babel',
+      bssid = '02:0E:8E:1E:61:10',
+      mcast_rate = 12000,
+    },
+  },
+
+  babel_mesh = {
+    prefix = 'fdef:ffc0:4fff:ffff::/64',
   },
 
   next_node = {
@@ -40,65 +59,15 @@
 
   fastd_mesh_vpn = {
     methods = {'salsa2012+umac'},
-    mtu = 1280,
+    mtu = 1426,
     groups = {
       backbone = {
       limit = 1,
         peers = {
-          gw03 = {   --[[ fpletz ]]
+          gw_test = {   --[[ fpletz ]]
-            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+            key = '23280df37b96cb587a3eeeb51c806bceeb627b8d063bb7dcc5492f4c9e3af356',
             remotes = {
-              'ipv4 "gw03.ffmuc.net" port 10001',
+              'ipv4 "hermes.bpletza.de" port 16000',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw04 = {
-            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-            remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10001',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw05 = {
-            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-            remotes = {
-              'ipv4 "gw05.ffmuc.net" port 10001',
-              'ipv4 "gw05.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw06 = {
-            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
-            remotes = {
-              'ipv4 "gw06.ffmuc.net" port 10001',
-              'ipv4 "gw06.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw07 = {
-            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
-            remotes = {
-              'ipv4 "gw07.ffmuc.net" port 10001',
-              'ipv4 "gw07.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw08 = {
-            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
-            remotes = {
-              'ipv4 "gw08.ffmuc.net" port 10001',
-              'ipv4 "gw08.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw09 = {
-            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
-            remotes = {
-              'ipv4 "gw09.ffmuc.net" port 10001',
-              'ipv4 "gw09.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw10 = {
-            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
-            remotes = {
-              'ipv4 "gw10.ffmuc.net" port 10001',
-              'ipv4 "gw10.freifunk-muenchen.de" port 10001',
             },
           },
         },
@@ -107,7 +76,7 @@
   },
 
   autoupdater = {
-    enabled = 1,
+    enabled = 0,
     branch = 'stable',
     branches = {
       stable = {

site.mk

@@ -1,6 +1,5 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-15 \
+	gluon-mesh-babel \
-	gluon-alfred \
 	gluon-announced \
 	gluon-autoupdater \
 	gluon-config-mode-core \
@@ -9,8 +8,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-mesh-vpn \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-contact-info \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \
 	gluon-luci-autoupdater \
 	gluon-luci-portconfig \
@@ -23,9 +20,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-status-page \
 	iwinfo \
 	iptables \
-	haveged \
+	haveged
-	gluon-ebtables-filter-arp-ffmuc \
-	gluon-ebtables-filter-multicast-ffmuc
 
 
 DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')