Update site configs for 2017.1

extra/ffbay_dah.conf

@@ -4,7 +4,10 @@
   site_code = 'ffbay_dah',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.248.0/21',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -39,7 +44,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     --mesh = {
-    --  id = 'ffmuc-umland-mesh',
+    --  id = 'ffmuc-mesh',
     --  mcast_rate = 12000,
     --},
     ibss = {
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
           limit = 1,
@@ -99,6 +105,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffbay_ebe.conf

@@ -4,7 +4,10 @@
   site_code = 'ffbay_ebe',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.240.0/21',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -39,7 +44,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     --mesh = {
-    --  id = 'ffmuc-umland-mesh',
+    --  id = 'ffmuc-mesh',
     --  mcast_rate = 12000,
     --},
     ibss = {
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
           limit = 1,
@@ -99,6 +105,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffbay_ed.conf

@@ -4,7 +4,10 @@
   site_code = 'ffbay_ed',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.16.0/21',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -39,7 +44,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     --mesh = {
-    --  id = 'ffmuc-umland-mesh',
+    --  id = 'ffmuc-mesh',
     --  mcast_rate = 12000,
     --},
     ibss = {
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
           limit = 1,
@@ -99,6 +105,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffbay_ffb.conf

@@ -4,7 +4,10 @@
   site_code = 'ffbay_ffb',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.232.0/21',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -39,7 +44,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     --mesh = {
-    --  id = 'ffmuc-umland-mesh',
+    --  id = 'ffmuc-mesh',
     --  mcast_rate = 12000,
     --},
     ibss = {
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
           limit = 1,
@@ -99,6 +105,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffbay_fs.conf

@@ -4,7 +4,10 @@
   site_code = 'ffbay_fs',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.224.0/21',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -39,7 +44,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     --mesh = {
-    --  id = 'ffmuc-umland-mesh',
+    --  id = 'ffmuc-mesh',
     --  mcast_rate = 12000,
     --},
     ibss = {
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
           limit = 1,
@@ -99,6 +105,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffbay_sta.conf

@@ -4,7 +4,10 @@
   site_code = 'ffbay_sta',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.0.0/21',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -39,7 +44,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     --mesh = {
-    --  id = 'ffmuc-umland-mesh',
+    --  id = 'ffmuc-mesh',
     --  mcast_rate = 12000,
     --},
     ibss = {
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
           limit = 1,
@@ -99,6 +105,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffbay_tol.conf

@@ -4,7 +4,10 @@
   site_code = 'ffbay_tol',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.8.0/21',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -39,7 +44,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     --mesh = {
-    --  id = 'ffmuc-umland-mesh',
+    --  id = 'ffmuc-mesh',
     --  mcast_rate = 12000,
     --},
     ibss = {
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
           limit = 1,
@@ -99,6 +105,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.32.0/19',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc01.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc01',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.132.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc02.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc02',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.164.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc03.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc03',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.168.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc04.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc04',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.200.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc05.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc05',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.136.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc06.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc06',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.212.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc07.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc07',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.208.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc08.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc08',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.204.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc09.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc09',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.180.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc10.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc10',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.176.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc11.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc11',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.172.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc12.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc12',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.196.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc13.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc13',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.148.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc14.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc14',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.144.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc15.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc15',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.220.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc16.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc16',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.192.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc17.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc17',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.184.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc19.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc19',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.216.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc20.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc20',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.156.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc21.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc21',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.188.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc22.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc22',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.140.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc23.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc23',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.128.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc24.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc24',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.152.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc25.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc25',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.160.0/22',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc_land.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc_land',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.24.0/21',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc_umland.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc_umland',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.96.0/19',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -39,7 +44,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     --mesh = {
-    --  id = 'ffmuc-umland-mesh',
+    --  id = 'ffmuc-mesh',
     --  mcast_rate = 12000,
     --},
     ibss = {
@@ -56,14 +61,15 @@
   },
 
   next_node = {
-    ip4 = '10.80.96.1',
-    ip6 = 'fdef:ffc0:4fff:2::1',
+    ip4 = '10.80.32.1',
+    ip6 = 'fdef:ffc0:4fff::1',
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
           limit = 1,
@@ -99,6 +105,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

extra/ffmuc_welcome.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc_welcome',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.64.0/19',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -99,6 +105,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

site.conf

@@ -4,7 +4,10 @@
   site_code = 'ffmuc',
 
   opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+    extra = {
+      # FIXME
+      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
+    },
   },
 
   prefix4 = '10.80.32.0/19',
@@ -19,6 +22,8 @@
 
   wifi24 = {
     channel = 6,
+    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
@@ -61,9 +66,10 @@
     mac = '16:41:95:40:f7:dc',
   },
 
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1280,
+    fastd = {
+      methods = {'salsa2012+umac'},
       groups = {
         backbone = {
         limit = 1,
@@ -106,6 +112,7 @@
           },
         },
       },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,