Merge branch 'experimental'

2015-11-06 00:50:37 +01:00
parent af8a3efe88 d116887d1a
commit 070612c696
2 changed files with 36 additions and 14 deletions
--- a/site.conf
+++ b/site.conf
@@ -15,21 +15,43 @@
  regdom = 'DE',

  wifi24 = {
-    ssid = 'muenchen.freifunk.net',
    channel = 6,
    htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    mesh = {
+      id = 'ffmuc-mesh',
+      mcast_rate = 12000,
+    },
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
  },

  wifi5 = {
-    ssid = 'muenchen.freifunk.net',
    channel = 44,
    htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    mesh = {
+      id = 'ffmuc-mesh',
+      mcast_rate = 12000,
+    },
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
  },

  next_node = {