From 3115dc79c1a1108d769eb38865ff3c14311f4281 Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Sat, 17 Oct 2015 12:30:23 +0200
Subject: [PATCH] l2tp Testing

---
 modules   | 5 +++++
 site.conf | 8 ++++++++
 site.mk   | 5 +++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules b/modules
index 3124474..622cf8f 100644
--- a/modules
+++ b/modules
@@ -2,3 +2,8 @@ GLUON_SITE_FEEDS='tro'
 
 PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git
 PACKAGES_TRO_COMMIT=e92ccaeebb53a8308bb2729721a77cebad0b3494
+
+GLUON_SITE_FEEDS='ffrl'
+
+PACKAGES_FFRL_REPO=https://github.com/ffrl/ffrl-packages
+PACKAGES_FFRL_COMMIT=dcfdc0d6b42c07a81e3456e249068cf1fe0e99b0
diff --git a/site.conf b/site.conf
index 2f93f7d..e3c7f85 100644
--- a/site.conf
+++ b/site.conf
@@ -163,6 +163,14 @@
             },
         },
     },
+    roguenets_filter = {
+        allowed_prefix4 = '10.188.0.0/16',
+        allowed_prefix6 = 'fda0:747e:ab29:7405::/64',
+    },
+    tunneldigger_mesh_vpn = {
+        mtu = 1312,
+        brokers = {'troisdorf3.freifunk-troisdorf.de:53844','troisdorf2.freifunk-troisdorf.de:53844'},
+    },
     roles = {
         default = 'node',
         list = {
diff --git a/site.mk b/site.mk
index a51eb0b..fee099c 100644
--- a/site.mk
+++ b/site.mk
@@ -8,18 +8,19 @@ GLUON_SITE_PACKAGES := \
     gluon-config-mode-core \
     gluon-config-mode-autoupdater \
     gluon-config-mode-hostname \
-    gluon-config-mode-mesh-vpn \
     gluon-config-mode-geo-location \
     gluon-config-mode-contact-info \
+    gluon-config-mode-tunneldigger \
     gluon-ebtables-filter-multicast \
     gluon-ebtables-filter-ra-dhcp \
+    gluon-ebtables-filter-roguenets \
     gluon-luci-admin \
     gluon-luci-autoupdater \
     gluon-luci-portconfig \
     gluon-luci-private-wifi \
     gluon-luci-node-role \
     gluon-next-node \
-    gluon-mesh-vpn-fastd \
+    gluon-mesh-vpn-tunneldigger \
     gluon-radvd \
     gluon-status-page \
     iwinfo \