From 463e2a373349671d842d2d03610c92d216324ddf Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Sat, 20 Jul 2019 11:27:23 +0200
Subject: [PATCH] Update site.conf

---
 site.conf | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/site.conf b/site.conf
index 24b747f..86e7148 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,7 @@
     hostname_prefix = 'tdf',
     site_name = 'Freifunk Troisdorf',
     site_code = 'tdf',
-    opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+    domain_seed = '9a38c49fc5069254c7588a551e6b781691600055fce54777c31e051c3ff84352',
     prefix4 = '10.188.0.0/19',
     prefix6 = 'fda0:747e:ab29:7405::/64',
     timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
@@ -39,6 +39,7 @@
         mac = '04:74:05:d0:4f:aa',
     },
     mesh = {
+    	vxlan = false,
         batman_adv = {
             gw_sel_class = 3,
         },
@@ -52,7 +53,7 @@
                 mirrors = {
                     'http://update1.infra.fftdf/tdf/stable/sysupgrade',
                     'http://update2.infra.fftdf/tdf/stable/sysupgrade',
-                    'http://update3.infra.fftdf/tdf/stable/sysupgrade'
+                    'http://images.freifunk-troisdorf.de/tdf/stable/sysupgrade'
                 },
                 probability = 1.00,
                 good_signatures = 2,
@@ -74,10 +75,10 @@
                 mirrors = {
                     'http://update1.infra.fftdf/tdf/beta/sysupgrade',
                     'http://update2.infra.fftdf/tdf/beta/sysupgrade',
-                    'http://update3.infra.fftdf/tdf/beta/sysupgrade'
+                    'http://images.freifunk-troisdorf.de/tdf/beta/sysupgrade'
                 },
                 probability = 1.00,
-                good_signatures = 1,
+                good_signatures = 2,
                 pubkeys = {
                     '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
                     '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7',     -- Kemal
@@ -95,10 +96,10 @@
                 mirrors = {
                     'http://update1.infra.fftdf/tdf/experimental/sysupgrade',
                     'http://update2.infra.fftdf/tdf/experimental/sysupgrade',
-                    'http://update3.infra.fftdf/tdf/experimental/sysupgrade'
+                    'http://images.freifunk-troisdorf.de/tdf/experimental/sysupgrade'
                 },
                 probability = 1.00,
-                good_signatures = 1,
+                good_signatures = 2,
                 pubkeys = {
                     '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
                     '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7',     -- Kemal
@@ -113,24 +114,31 @@
             },
         },
     },
-    tunneldigger_mesh_vpn = {
+    mesh_vpn = {
         mtu = 1312,
-        brokers = {
-            'tdf1.freifunk-troisdorf.de:53842',
-            'tdf2.freifunk-troisdorf.de:53840'
+        tunneldigger = {
+            brokers = {
+                'tdf1.freifunk-troisdorf.de:53842',
+                'tdf2.freifunk-troisdorf.de:53840'
+                },
+            bandwidth_limit = {
+                enabled = false,
+                egress = 2000,
+                ingress = 6000,
+                },
             },
     },
     roles = {
         default = 'node',
         list = {
-            node,
-            uplink,
-            test,
-            nightswitch,
-            mesh,
-            backbone,
-            service,
-            meshanduplink,
+            'node',
+            'test',
+            'backbone',
+            'mesh',
+            'meshanduplink',
+            'nightswitch',
+            'service',
+            'uplink',
         },
     },
     config_mode = {