From 76fe1447f42f3a13d50807565dfcb6ed324dd5a5 Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Sun, 25 Oct 2015 11:57:38 +0100
Subject: [PATCH] Site v2015.2 Changes

---
 site.conf | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/site.conf b/site.conf
index 92ea346..9409f34 100644
--- a/site.conf
+++ b/site.conf
@@ -14,37 +14,51 @@
     },
     regdom = 'DE',
     wifi24 = {
-        ssid = 'Freifunk',
-        channel = 11,
+        channel = 5,
         htmode = 'HT20',
-        mesh_ssid = 'troisdorf-freifunk-mesh',
-        mesh_bssid = '02:74:05:d0:4f:00',
-        mesh_mcast_rate = 12000,
+        ap = {
+            ssid = 'Freifunk',
+        },
+        mesh = {
+            id = 'troisdorf-ff-mesh',
+            mcast_rate = 12000,
+        },
+        ibss ={
+            ssid = '02:74:05:d0:4f:00',
+            bssid = '02:74:05:d0:4f:00',
+            mcast_rate = 12000,
+        },
     },
     wifi5 = {
-        ssid = 'Freifunk',
         channel = 44,
         htmode = 'HT40+',
-        mesh_ssid = 'troisdorf-freifunk-mesh',
-        mesh_bssid = '02:74:05:d0:4f:00',
-        mesh_mcast_rate = 12000,
+        ap = {
+            ssid = 'Freifunk',
+        },
+        mesh = {
+            id = 'troisdorf-ff-mesh',
+            mcast_rate = 12000,
+        },
+        ibss ={
+            ssid = '02:74:05:d0:4f:00',
+            bssid = '02:74:05:d0:4f:00',
+            mcast_rate = 12000,
+        },
     },
     next_node = {
         ip4 = '10.188.0.1',
         ip6 = 'fda0:747e:ab29:7405::1',
         mac = '04:74:05:d0:4f:aa',
     },
-    fastd_mesh_vpn = {
-        enabled = true,
+fastd_mesh_vpn = {
         methods = {
-            'null',
             'salsa2012+umac',
             'salsa2012+gmac'
         },
         mtu = 1312,
         groups = {
             backbone = {
-                limit = 3,
+                limit = 4,
                 peers = {
                     wupper0 = {
                         key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b',
@@ -69,10 +83,10 @@
                 },
             },
             troisdorf = {
-                limit = 3,
+                limit = 4,
                 peers = {
                     troisdorf1 = {
-                        key = '9154293d90bb907a647338585da4ddf283e534a948a0bb73ca604391fdd4aa0b',
+                        key = '4246ddd370bb12a4b371d6cfab4e00591361eac1a1a9f1f962725823a302eb8f',
                         remotes = {'"troisdorf1.freifunk-troisdorf.de" port 53842'},
                         },
                     troisdorf2 = {