Revert "Enable babel meshing, disable batman"

This reverts commit c3fa483996.
2015-08-22 23:24:28 +02:00
parent f7ef41a3eb
commit 2973750275
2 changed files with 5 additions and 6 deletions
--- a/site.conf
+++ b/site.conf
@@ -48,10 +48,6 @@
    },
  },

-  babel_mesh = {
-    prefix = 'fdef:ffc0:4fff:ffff::/64',
-  },
-
  next_node = {
    ip4 = '10.80.0.1',
    ip6 = 'fdef:ffc0:4fff::1',
--- a/site.mk
+++ b/site.mk
@@ -1,5 +1,5 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-babel \
+	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
 	gluon-announced \
 	gluon-autoupdater \
@@ -23,7 +23,10 @@ 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')