From 6b2daf5df2487806ef4b68ac25ff23d7ccab5702 Mon Sep 17 00:00:00 2001
From: Martin Geno <geno+dev@fireorbit.de>
Date: Sat, 1 Jul 2017 19:54:32 +0200
Subject: [PATCH] use batman

---
 .gitmodules |  2 +-
 gluon       |  2 +-
 site.conf   | 13 +++++--------
 site.mk     |  8 ++++++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index b04e1fc..8d6cc9d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "gluon"]
 	path = gluon
-	url = https://github.com/freifunk-ffm/gluon.git
+	url = https://github.com/freifunk-gluon/gluon.git
diff --git a/gluon b/gluon
index 155d06c..31893cb 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit 155d06cca2358fd5580f7298041ba4b03a6175e9
+Subproject commit 31893cb91293d501e501de47d5b750e1497bc8a9
diff --git a/site.conf b/site.conf
index dc9716e..a504eeb 100755
--- a/site.conf
+++ b/site.conf
@@ -11,10 +11,8 @@
 	site_code = 'breminale',
 	site_seed = '48a9de099ffe3b2d4410955afd65c33edec2f109a638393b9ee66d837f12c514',
 
-	babel_mesh = { prefix = '2a00:C380:DEAD:7338::/64', },
 	mesh_on_lan = true, -- breminale spezifisch
 	poe_passthrough = true,
-	vxlan_id = 4123,
 
 	prefix4 = '10.43.0.0/16',
 	prefix6 = '2a00:C380:DEAD:7337::/64',
@@ -37,8 +35,8 @@
 			ssid = 'bremen.freifunk.net',
 		},
 		mesh = {
-			id = 'babel.ffhb.de',
-			mcast_rate = 12000,
+			id = 'batman.ffhb.de',
+			mcast_rate = 6000,
 		},
 	},
 	wifi5 = {
@@ -47,14 +45,13 @@
 			ssid = 'bremen.freifunk.net',
 		},
 		mesh = {
-			id = 'babel.ffhb.de',
-			mcast_rate = 12000,
+			id = 'batman.ffhb.de',
+			mcast_rate = 6000,
 		},
 	},
 
 	dns = {
-	  cacheentries = 5000,
-	  servers = { '2001:db8::1', },
+		cacheentries = 5000,
 	},
 
 	next_node = {
diff --git a/site.mk b/site.mk
index b8f4ced..b9fe773 100755
--- a/site.mk
+++ b/site.mk
@@ -1,11 +1,14 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-babel \
-	gluon-l3roamd \
+	gluon-mesh-batman-adv-14 \
 	gluon-respondd \
 	respondd-module-airtime \
 	respondd-module-wifisettings \
 	gluon-respondd-lldp \
+	gluon-ebtables-filter-multicast \
+	gluon-ebtables-filter-ra-dhcp \
+	gluon-ebtables-segment-mld \
 	gluon-client-bridge \
+	gluon-radv-filterd \
 	gluon-radvd \
 	gluon-neighbour-info \
 	gluon-node-info \
@@ -14,6 +17,7 @@ GLUON_SITE_PACKAGES := \
 	iputils-ping6 \
 	iwinfo \
 	iptables \
+	firewall \
 	haveged \
 	gluon-authorized-keys \
 	ffhb-breminale \