From 862546289ab9c7d015d2452aee9df8ab87e0cfaf Mon Sep 17 00:00:00 2001
From: Stefan Hoffmann <stefan@tro-mail.de>
Date: Sat, 10 Jun 2017 22:26:59 +0200
Subject: [PATCH] 2017.1 Anpassungen

---
 site.conf | 34 ++++++++++++++++++++--------------
 site.mk   | 13 +++++--------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/site.conf b/site.conf
index 6034a6d..0d716b5 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,6 @@
     hostname_prefix = 'tdf',
     site_name = 'Freifunk Troisdorf - Unterkünfte',
     site_code = 'flu',
-    opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
     prefix4 = '10.188.64.0/19',
     prefix6 = 'fda0:747e:ab29:7405::/64',
     timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
@@ -114,24 +113,31 @@
             },
         },
     },
-    tunneldigger_mesh_vpn = {
-        mtu = 1312,
-        brokers = {
-            'flu1.freifunk-troisdorf.de:53842',
-            'flu2.freifunk-troisdorf.de:53840'
+    mesh_vpn = {
+    	tunneldigger = {
+	        mtu = 1312,
+	        brokers = {
+	            'flu1.freifunk-troisdorf.de:53842',
+	            'flu2.freifunk-troisdorf.de:53840'
+	            },
+	        bandwidth_limit = {
+	        	enabled = false,
+	        	egress = 2000,
+	        	ingress = 6000,
+	        	},
             },
     },
     roles = {
         default = 'node',
         list = {
-            node,
-            uplink,
-            nightswitch,
-            test,
-            mesh,
-            backbone,
-            service,
-            meshanduplink,
+            'node',
+            'uplink',
+            'nightswitch',
+            'test',
+            'mesh',
+            'backbone',
+            'service',
+            'meshanduplink',
         },
     },
     config_mode = {
diff --git a/site.mk b/site.mk
index ede2456..d36b2cb 100644
--- a/site.mk
+++ b/site.mk
@@ -10,17 +10,14 @@ GLUON_SITE_PACKAGES := \
     gluon-config-mode-geo-location \
     gluon-config-mode-contact-info \
     gluon-config-mode-tunneldigger \
-    gluon-migrate-vpn \
     gluon-ebtables-filter-multicast \
     gluon-ebtables-filter-ra-dhcp \
-    gluon-luci-admin \
-    gluon-luci-autoupdater \
-    gluon-luci-portconfig \
-    gluon-luci-private-wifi \
-    gluon-luci-node-role \
+    gluon-web-admin \
+    gluon-web-autoupdater \
+    gluon-web-network \
+    gluon-web-private-wifi \
+    gluon-web-node-role \
     gluon-next-node \
-    gluon-mesh-vpn-tunneldigger \
-    gluon-tunneldigger-watchdog \
     gluon-radvd \
     gluon-status-page \
     iwinfo \