From f274d51ea4fcd6b8812f958e11453241358683dc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 12 Jul 2017 10:41:54 +0200 Subject: [PATCH] Update site configs for 2017.1 --- extra/ffbay_dah.conf | 69 +++++++++++++++++++---------------- extra/ffbay_ebe.conf | 69 +++++++++++++++++++---------------- extra/ffbay_ed.conf | 69 +++++++++++++++++++---------------- extra/ffbay_ffb.conf | 69 +++++++++++++++++++---------------- extra/ffbay_fs.conf | 69 +++++++++++++++++++---------------- extra/ffbay_sta.conf | 69 +++++++++++++++++++---------------- extra/ffbay_tol.conf | 69 +++++++++++++++++++---------------- extra/ffmuc.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc01.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc02.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc03.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc04.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc05.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc06.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc07.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc08.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc09.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc10.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc11.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc12.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc13.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc14.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc15.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc16.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc17.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc19.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc20.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc21.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc22.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc23.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc24.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc25.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc_land.conf | 79 ++++++++++++++++++++++------------------ extra/ffmuc_umland.conf | 73 ++++++++++++++++++++----------------- extra/ffmuc_welcome.conf | 67 +++++++++++++++++++--------------- site.conf | 79 ++++++++++++++++++++++------------------ 36 files changed, 1504 insertions(+), 1252 deletions(-) diff --git a/extra/ffbay_dah.conf b/extra/ffbay_dah.conf index ec966b0..b8986b2 100644 --- a/extra/ffbay_dah.conf +++ b/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,39 +66,41 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gwu01 = { - key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', - remotes = { - '"gwu01.ffmuc.net" port 10049', - '"gwu01.freifunk-muenchen.de" port 10049', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', + remotes = { + '"gwu01.ffmuc.net" port 10049', + '"gwu01.freifunk-muenchen.de" port 10049', + }, }, - }, - gwu02 = { - key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', - remotes = { - '"gwu02.ffmuc.net" port 10049', - '"gwu02.freifunk-muenchen.de" port 10049', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', + remotes = { + '"gwu02.ffmuc.net" port 10049', + '"gwu02.freifunk-muenchen.de" port 10049', + }, }, - }, - gwu03 = { - key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', - remotes = { - '"gwu03.ffmuc.net" port 10049', - '"gwu03.freifunk-muenchen.de" port 10049', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', + remotes = { + '"gwu03.ffmuc.net" port 10049', + '"gwu03.freifunk-muenchen.de" port 10049', + }, }, - }, - gwu04 = { - key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', - remotes = { - '"gwu04.ffmuc.net" port 10049', - '"gwu04.freifunk-muenchen.de" port 10049', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', + remotes = { + '"gwu04.ffmuc.net" port 10049', + '"gwu04.freifunk-muenchen.de" port 10049', + }, }, }, }, diff --git a/extra/ffbay_ebe.conf b/extra/ffbay_ebe.conf index 4f3fcd6..89f20e3 100644 --- a/extra/ffbay_ebe.conf +++ b/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,39 +66,41 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gwu01 = { - key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', - remotes = { - '"gwu01.ffmuc.net" port 10062', - '"gwu01.freifunk-muenchen.de" port 10062', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', + remotes = { + '"gwu01.ffmuc.net" port 10062', + '"gwu01.freifunk-muenchen.de" port 10062', + }, }, - }, - gwu02 = { - key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', - remotes = { - '"gwu02.ffmuc.net" port 10062', - '"gwu02.freifunk-muenchen.de" port 10062', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', + remotes = { + '"gwu02.ffmuc.net" port 10062', + '"gwu02.freifunk-muenchen.de" port 10062', + }, }, - }, - gwu03 = { - key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', - remotes = { - '"gwu03.ffmuc.net" port 10062', - '"gwu03.freifunk-muenchen.de" port 10062', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', + remotes = { + '"gwu03.ffmuc.net" port 10062', + '"gwu03.freifunk-muenchen.de" port 10062', + }, }, - }, - gwu04 = { - key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', - remotes = { - '"gwu04.ffmuc.net" port 10062', - '"gwu04.freifunk-muenchen.de" port 10062', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', + remotes = { + '"gwu04.ffmuc.net" port 10062', + '"gwu04.freifunk-muenchen.de" port 10062', + }, }, }, }, diff --git a/extra/ffbay_ed.conf b/extra/ffbay_ed.conf index 324a54f..45ad704 100644 --- a/extra/ffbay_ed.conf +++ b/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,39 +66,41 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gwu01 = { - key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', - remotes = { - '"gwu01.ffmuc.net" port 10061', - '"gwu01.freifunk-muenchen.de" port 10061', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', + remotes = { + '"gwu01.ffmuc.net" port 10061', + '"gwu01.freifunk-muenchen.de" port 10061', + }, }, - }, - gwu02 = { - key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', - remotes = { - '"gwu02.ffmuc.net" port 10061', - '"gwu02.freifunk-muenchen.de" port 10061', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', + remotes = { + '"gwu02.ffmuc.net" port 10061', + '"gwu02.freifunk-muenchen.de" port 10061', + }, }, - }, - gwu03 = { - key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', - remotes = { - '"gwu03.ffmuc.net" port 10061', - '"gwu03.freifunk-muenchen.de" port 10061', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', + remotes = { + '"gwu03.ffmuc.net" port 10061', + '"gwu03.freifunk-muenchen.de" port 10061', + }, }, - }, - gwu04 = { - key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', - remotes = { - '"gwu04.ffmuc.net" port 10061', - '"gwu04.freifunk-muenchen.de" port 10061', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', + remotes = { + '"gwu04.ffmuc.net" port 10061', + '"gwu04.freifunk-muenchen.de" port 10061', + }, }, }, }, diff --git a/extra/ffbay_ffb.conf b/extra/ffbay_ffb.conf index 6910953..a4fbca3 100644 --- a/extra/ffbay_ffb.conf +++ b/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,39 +66,41 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gwu01 = { - key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', - remotes = { - '"gwu01.ffmuc.net" port 10048', - '"gwu01.freifunk-muenchen.de" port 10048', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', + remotes = { + '"gwu01.ffmuc.net" port 10048', + '"gwu01.freifunk-muenchen.de" port 10048', + }, }, - }, - gwu02 = { - key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', - remotes = { - '"gwu02.ffmuc.net" port 10048', - '"gwu02.freifunk-muenchen.de" port 10048', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', + remotes = { + '"gwu02.ffmuc.net" port 10048', + '"gwu02.freifunk-muenchen.de" port 10048', + }, }, - }, - gwu03 = { - key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', - remotes = { - '"gwu03.ffmuc.net" port 10048', - '"gwu03.freifunk-muenchen.de" port 10048', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', + remotes = { + '"gwu03.ffmuc.net" port 10048', + '"gwu03.freifunk-muenchen.de" port 10048', + }, }, - }, - gwu04 = { - key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', - remotes = { - '"gwu04.ffmuc.net" port 10048', - '"gwu04.freifunk-muenchen.de" port 10048', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', + remotes = { + '"gwu04.ffmuc.net" port 10048', + '"gwu04.freifunk-muenchen.de" port 10048', + }, }, }, }, diff --git a/extra/ffbay_fs.conf b/extra/ffbay_fs.conf index 6d10286..42a27e4 100644 --- a/extra/ffbay_fs.conf +++ b/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,39 +66,41 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gwu01 = { - key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', - remotes = { - '"gwu01.ffmuc.net" port 10050', - '"gwu01.freifunk-muenchen.de" port 10050', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', + remotes = { + '"gwu01.ffmuc.net" port 10050', + '"gwu01.freifunk-muenchen.de" port 10050', + }, }, - }, - gwu02 = { - key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', - remotes = { - '"gwu02.ffmuc.net" port 10050', - '"gwu02.freifunk-muenchen.de" port 10050', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', + remotes = { + '"gwu02.ffmuc.net" port 10050', + '"gwu02.freifunk-muenchen.de" port 10050', + }, }, - }, - gwu03 = { - key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', - remotes = { - '"gwu03.ffmuc.net" port 10050', - '"gwu03.freifunk-muenchen.de" port 10050', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', + remotes = { + '"gwu03.ffmuc.net" port 10050', + '"gwu03.freifunk-muenchen.de" port 10050', + }, }, - }, - gwu04 = { - key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', - remotes = { - '"gwu04.ffmuc.net" port 10050', - '"gwu04.freifunk-muenchen.de" port 10050', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', + remotes = { + '"gwu04.ffmuc.net" port 10050', + '"gwu04.freifunk-muenchen.de" port 10050', + }, }, }, }, diff --git a/extra/ffbay_sta.conf b/extra/ffbay_sta.conf index 07b382d..5266cda 100644 --- a/extra/ffbay_sta.conf +++ b/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,39 +66,41 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gwu01 = { - key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', - remotes = { - '"gwu01.ffmuc.net" port 10047', - '"gwu01.freifunk-muenchen.de" port 10047', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', + remotes = { + '"gwu01.ffmuc.net" port 10047', + '"gwu01.freifunk-muenchen.de" port 10047', + }, }, - }, - gwu02 = { - key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', - remotes = { - '"gwu02.ffmuc.net" port 10047', - '"gwu02.freifunk-muenchen.de" port 10047', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', + remotes = { + '"gwu02.ffmuc.net" port 10047', + '"gwu02.freifunk-muenchen.de" port 10047', + }, }, - }, - gwu03 = { - key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', - remotes = { - '"gwu03.ffmuc.net" port 10047', - '"gwu03.freifunk-muenchen.de" port 10047', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', + remotes = { + '"gwu03.ffmuc.net" port 10047', + '"gwu03.freifunk-muenchen.de" port 10047', + }, }, - }, - gwu04 = { - key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', - remotes = { - '"gwu04.ffmuc.net" port 10047', - '"gwu04.freifunk-muenchen.de" port 10047', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', + remotes = { + '"gwu04.ffmuc.net" port 10047', + '"gwu04.freifunk-muenchen.de" port 10047', + }, }, }, }, diff --git a/extra/ffbay_tol.conf b/extra/ffbay_tol.conf index 738a04d..2b5e50f 100644 --- a/extra/ffbay_tol.conf +++ b/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,39 +66,41 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gwu01 = { - key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', - remotes = { - '"gwu01.ffmuc.net" port 10063', - '"gwu01.freifunk-muenchen.de" port 10063', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', + remotes = { + '"gwu01.ffmuc.net" port 10063', + '"gwu01.freifunk-muenchen.de" port 10063', + }, }, - }, - gwu02 = { - key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', - remotes = { - '"gwu02.ffmuc.net" port 10063', - '"gwu02.freifunk-muenchen.de" port 10063', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', + remotes = { + '"gwu02.ffmuc.net" port 10063', + '"gwu02.freifunk-muenchen.de" port 10063', + }, }, - }, - gwu03 = { - key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', - remotes = { - '"gwu03.ffmuc.net" port 10063', - '"gwu03.freifunk-muenchen.de" port 10063', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', + remotes = { + '"gwu03.ffmuc.net" port 10063', + '"gwu03.freifunk-muenchen.de" port 10063', + }, }, - }, - gwu04 = { - key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', - remotes = { - '"gwu04.ffmuc.net" port 10063', - '"gwu04.freifunk-muenchen.de" port 10063', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', + remotes = { + '"gwu04.ffmuc.net" port 10063', + '"gwu04.freifunk-muenchen.de" port 10063', + }, }, }, }, diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf index f3f1e5b..dab101c 100644 --- a/extra/ffmuc.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10001', - '"gw01.freifunk-muenchen.de" port 10001', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10001', + '"gw01.freifunk-muenchen.de" port 10001', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10001', - '"gw02.freifunk-muenchen.de" port 10001', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10001', + '"gw02.freifunk-muenchen.de" port 10001', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10001', - '"gw03.freifunk-muenchen.de" port 10001', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10001', + '"gw03.freifunk-muenchen.de" port 10001', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10001', - '"gw04.freifunk-muenchen.de" port 10001', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10001', + '"gw04.freifunk-muenchen.de" port 10001', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10001', - '"gw05.freifunk-muenchen.de" port 10001', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10001', + '"gw05.freifunk-muenchen.de" port 10001', + }, }, }, }, diff --git a/extra/ffmuc01.conf b/extra/ffmuc01.conf index d911a94..663af1d 100644 --- a/extra/ffmuc01.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10021', - '"gw01.freifunk-muenchen.de" port 10021', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10021', + '"gw01.freifunk-muenchen.de" port 10021', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10021', - '"gw02.freifunk-muenchen.de" port 10021', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10021', + '"gw02.freifunk-muenchen.de" port 10021', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10021', - '"gw03.freifunk-muenchen.de" port 10021', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10021', + '"gw03.freifunk-muenchen.de" port 10021', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10021', - '"gw04.freifunk-muenchen.de" port 10021', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10021', + '"gw04.freifunk-muenchen.de" port 10021', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10021', - '"gw05.freifunk-muenchen.de" port 10021', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10021', + '"gw05.freifunk-muenchen.de" port 10021', + }, }, }, }, diff --git a/extra/ffmuc02.conf b/extra/ffmuc02.conf index a0efac3..5787a96 100644 --- a/extra/ffmuc02.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10022', - '"gw01.freifunk-muenchen.de" port 10022', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10022', + '"gw01.freifunk-muenchen.de" port 10022', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10022', - '"gw02.freifunk-muenchen.de" port 10022', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10022', + '"gw02.freifunk-muenchen.de" port 10022', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10022', - '"gw03.freifunk-muenchen.de" port 10022', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10022', + '"gw03.freifunk-muenchen.de" port 10022', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10022', - '"gw04.freifunk-muenchen.de" port 10022', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10022', + '"gw04.freifunk-muenchen.de" port 10022', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10022', - '"gw05.freifunk-muenchen.de" port 10022', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10022', + '"gw05.freifunk-muenchen.de" port 10022', + }, }, }, }, diff --git a/extra/ffmuc03.conf b/extra/ffmuc03.conf index a325c5f..34045da 100644 --- a/extra/ffmuc03.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10023', - '"gw01.freifunk-muenchen.de" port 10023', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10023', + '"gw01.freifunk-muenchen.de" port 10023', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10023', - '"gw02.freifunk-muenchen.de" port 10023', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10023', + '"gw02.freifunk-muenchen.de" port 10023', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10023', - '"gw03.freifunk-muenchen.de" port 10023', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10023', + '"gw03.freifunk-muenchen.de" port 10023', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10023', - '"gw04.freifunk-muenchen.de" port 10023', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10023', + '"gw04.freifunk-muenchen.de" port 10023', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10023', - '"gw05.freifunk-muenchen.de" port 10023', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10023', + '"gw05.freifunk-muenchen.de" port 10023', + }, }, }, }, diff --git a/extra/ffmuc04.conf b/extra/ffmuc04.conf index a2a5c25..fe2fa7a 100644 --- a/extra/ffmuc04.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10024', - '"gw01.freifunk-muenchen.de" port 10024', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10024', + '"gw01.freifunk-muenchen.de" port 10024', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10024', - '"gw02.freifunk-muenchen.de" port 10024', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10024', + '"gw02.freifunk-muenchen.de" port 10024', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10024', - '"gw03.freifunk-muenchen.de" port 10024', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10024', + '"gw03.freifunk-muenchen.de" port 10024', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10024', - '"gw04.freifunk-muenchen.de" port 10024', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10024', + '"gw04.freifunk-muenchen.de" port 10024', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10024', - '"gw05.freifunk-muenchen.de" port 10024', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10024', + '"gw05.freifunk-muenchen.de" port 10024', + }, }, }, }, diff --git a/extra/ffmuc05.conf b/extra/ffmuc05.conf index 74e4258..5a31dde 100644 --- a/extra/ffmuc05.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10025', - '"gw01.freifunk-muenchen.de" port 10025', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10025', + '"gw01.freifunk-muenchen.de" port 10025', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10025', - '"gw02.freifunk-muenchen.de" port 10025', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10025', + '"gw02.freifunk-muenchen.de" port 10025', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10025', - '"gw03.freifunk-muenchen.de" port 10025', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10025', + '"gw03.freifunk-muenchen.de" port 10025', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10025', - '"gw04.freifunk-muenchen.de" port 10025', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10025', + '"gw04.freifunk-muenchen.de" port 10025', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10025', - '"gw05.freifunk-muenchen.de" port 10025', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10025', + '"gw05.freifunk-muenchen.de" port 10025', + }, }, }, }, diff --git a/extra/ffmuc06.conf b/extra/ffmuc06.conf index c3c4b91..78899e8 100644 --- a/extra/ffmuc06.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10026', - '"gw01.freifunk-muenchen.de" port 10026', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10026', + '"gw01.freifunk-muenchen.de" port 10026', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10026', - '"gw02.freifunk-muenchen.de" port 10026', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10026', + '"gw02.freifunk-muenchen.de" port 10026', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10026', - '"gw03.freifunk-muenchen.de" port 10026', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10026', + '"gw03.freifunk-muenchen.de" port 10026', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10026', - '"gw04.freifunk-muenchen.de" port 10026', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10026', + '"gw04.freifunk-muenchen.de" port 10026', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10026', - '"gw05.freifunk-muenchen.de" port 10026', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10026', + '"gw05.freifunk-muenchen.de" port 10026', + }, }, }, }, diff --git a/extra/ffmuc07.conf b/extra/ffmuc07.conf index dfb1ebc..281d315 100644 --- a/extra/ffmuc07.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10027', - '"gw01.freifunk-muenchen.de" port 10027', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10027', + '"gw01.freifunk-muenchen.de" port 10027', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10027', - '"gw02.freifunk-muenchen.de" port 10027', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10027', + '"gw02.freifunk-muenchen.de" port 10027', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10027', - '"gw03.freifunk-muenchen.de" port 10027', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10027', + '"gw03.freifunk-muenchen.de" port 10027', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10027', - '"gw04.freifunk-muenchen.de" port 10027', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10027', + '"gw04.freifunk-muenchen.de" port 10027', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10027', - '"gw05.freifunk-muenchen.de" port 10027', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10027', + '"gw05.freifunk-muenchen.de" port 10027', + }, }, }, }, diff --git a/extra/ffmuc08.conf b/extra/ffmuc08.conf index 601f4d7..378ef0b 100644 --- a/extra/ffmuc08.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10028', - '"gw01.freifunk-muenchen.de" port 10028', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10028', + '"gw01.freifunk-muenchen.de" port 10028', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10028', - '"gw02.freifunk-muenchen.de" port 10028', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10028', + '"gw02.freifunk-muenchen.de" port 10028', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10028', - '"gw03.freifunk-muenchen.de" port 10028', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10028', + '"gw03.freifunk-muenchen.de" port 10028', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10028', - '"gw04.freifunk-muenchen.de" port 10028', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10028', + '"gw04.freifunk-muenchen.de" port 10028', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10028', - '"gw05.freifunk-muenchen.de" port 10028', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10028', + '"gw05.freifunk-muenchen.de" port 10028', + }, }, }, }, diff --git a/extra/ffmuc09.conf b/extra/ffmuc09.conf index e9157c3..7b2e429 100644 --- a/extra/ffmuc09.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10029', - '"gw01.freifunk-muenchen.de" port 10029', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10029', + '"gw01.freifunk-muenchen.de" port 10029', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10029', - '"gw02.freifunk-muenchen.de" port 10029', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10029', + '"gw02.freifunk-muenchen.de" port 10029', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10029', - '"gw03.freifunk-muenchen.de" port 10029', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10029', + '"gw03.freifunk-muenchen.de" port 10029', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10029', - '"gw04.freifunk-muenchen.de" port 10029', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10029', + '"gw04.freifunk-muenchen.de" port 10029', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10029', - '"gw05.freifunk-muenchen.de" port 10029', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10029', + '"gw05.freifunk-muenchen.de" port 10029', + }, }, }, }, diff --git a/extra/ffmuc10.conf b/extra/ffmuc10.conf index 6b122f0..775418a 100644 --- a/extra/ffmuc10.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10030', - '"gw01.freifunk-muenchen.de" port 10030', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10030', + '"gw01.freifunk-muenchen.de" port 10030', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10030', - '"gw02.freifunk-muenchen.de" port 10030', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10030', + '"gw02.freifunk-muenchen.de" port 10030', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10030', - '"gw03.freifunk-muenchen.de" port 10030', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10030', + '"gw03.freifunk-muenchen.de" port 10030', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10030', - '"gw04.freifunk-muenchen.de" port 10030', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10030', + '"gw04.freifunk-muenchen.de" port 10030', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10030', - '"gw05.freifunk-muenchen.de" port 10030', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10030', + '"gw05.freifunk-muenchen.de" port 10030', + }, }, }, }, diff --git a/extra/ffmuc11.conf b/extra/ffmuc11.conf index d17bada..a6f15b3 100644 --- a/extra/ffmuc11.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10031', - '"gw01.freifunk-muenchen.de" port 10031', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10031', + '"gw01.freifunk-muenchen.de" port 10031', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10031', - '"gw02.freifunk-muenchen.de" port 10031', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10031', + '"gw02.freifunk-muenchen.de" port 10031', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10031', - '"gw03.freifunk-muenchen.de" port 10031', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10031', + '"gw03.freifunk-muenchen.de" port 10031', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10031', - '"gw04.freifunk-muenchen.de" port 10031', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10031', + '"gw04.freifunk-muenchen.de" port 10031', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10031', - '"gw05.freifunk-muenchen.de" port 10031', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10031', + '"gw05.freifunk-muenchen.de" port 10031', + }, }, }, }, diff --git a/extra/ffmuc12.conf b/extra/ffmuc12.conf index f1180e8..b52c214 100644 --- a/extra/ffmuc12.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10032', - '"gw01.freifunk-muenchen.de" port 10032', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10032', + '"gw01.freifunk-muenchen.de" port 10032', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10032', - '"gw02.freifunk-muenchen.de" port 10032', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10032', + '"gw02.freifunk-muenchen.de" port 10032', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10032', - '"gw03.freifunk-muenchen.de" port 10032', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10032', + '"gw03.freifunk-muenchen.de" port 10032', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10032', - '"gw04.freifunk-muenchen.de" port 10032', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10032', + '"gw04.freifunk-muenchen.de" port 10032', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10032', - '"gw05.freifunk-muenchen.de" port 10032', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10032', + '"gw05.freifunk-muenchen.de" port 10032', + }, }, }, }, diff --git a/extra/ffmuc13.conf b/extra/ffmuc13.conf index becfb2c..bfb2153 100644 --- a/extra/ffmuc13.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10033', - '"gw01.freifunk-muenchen.de" port 10033', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10033', + '"gw01.freifunk-muenchen.de" port 10033', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10033', - '"gw02.freifunk-muenchen.de" port 10033', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10033', + '"gw02.freifunk-muenchen.de" port 10033', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10033', - '"gw03.freifunk-muenchen.de" port 10033', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10033', + '"gw03.freifunk-muenchen.de" port 10033', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10033', - '"gw04.freifunk-muenchen.de" port 10033', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10033', + '"gw04.freifunk-muenchen.de" port 10033', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10033', - '"gw05.freifunk-muenchen.de" port 10033', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10033', + '"gw05.freifunk-muenchen.de" port 10033', + }, }, }, }, diff --git a/extra/ffmuc14.conf b/extra/ffmuc14.conf index 880a584..a1f6544 100644 --- a/extra/ffmuc14.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10034', - '"gw01.freifunk-muenchen.de" port 10034', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10034', + '"gw01.freifunk-muenchen.de" port 10034', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10034', - '"gw02.freifunk-muenchen.de" port 10034', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10034', + '"gw02.freifunk-muenchen.de" port 10034', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10034', - '"gw03.freifunk-muenchen.de" port 10034', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10034', + '"gw03.freifunk-muenchen.de" port 10034', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10034', - '"gw04.freifunk-muenchen.de" port 10034', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10034', + '"gw04.freifunk-muenchen.de" port 10034', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10034', - '"gw05.freifunk-muenchen.de" port 10034', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10034', + '"gw05.freifunk-muenchen.de" port 10034', + }, }, }, }, diff --git a/extra/ffmuc15.conf b/extra/ffmuc15.conf index df339f8..ff8ebde 100644 --- a/extra/ffmuc15.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10035', - '"gw01.freifunk-muenchen.de" port 10035', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10035', + '"gw01.freifunk-muenchen.de" port 10035', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10035', - '"gw02.freifunk-muenchen.de" port 10035', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10035', + '"gw02.freifunk-muenchen.de" port 10035', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10035', - '"gw03.freifunk-muenchen.de" port 10035', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10035', + '"gw03.freifunk-muenchen.de" port 10035', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10035', - '"gw04.freifunk-muenchen.de" port 10035', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10035', + '"gw04.freifunk-muenchen.de" port 10035', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10035', - '"gw05.freifunk-muenchen.de" port 10035', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10035', + '"gw05.freifunk-muenchen.de" port 10035', + }, }, }, }, diff --git a/extra/ffmuc16.conf b/extra/ffmuc16.conf index 3f76e75..62e24ff 100644 --- a/extra/ffmuc16.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10036', - '"gw01.freifunk-muenchen.de" port 10036', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10036', + '"gw01.freifunk-muenchen.de" port 10036', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10036', - '"gw02.freifunk-muenchen.de" port 10036', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10036', + '"gw02.freifunk-muenchen.de" port 10036', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10036', - '"gw03.freifunk-muenchen.de" port 10036', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10036', + '"gw03.freifunk-muenchen.de" port 10036', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10036', - '"gw04.freifunk-muenchen.de" port 10036', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10036', + '"gw04.freifunk-muenchen.de" port 10036', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10036', - '"gw05.freifunk-muenchen.de" port 10036', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10036', + '"gw05.freifunk-muenchen.de" port 10036', + }, }, }, }, diff --git a/extra/ffmuc17.conf b/extra/ffmuc17.conf index 452e4c7..f464831 100644 --- a/extra/ffmuc17.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10037', - '"gw01.freifunk-muenchen.de" port 10037', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10037', + '"gw01.freifunk-muenchen.de" port 10037', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10037', - '"gw02.freifunk-muenchen.de" port 10037', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10037', + '"gw02.freifunk-muenchen.de" port 10037', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10037', - '"gw03.freifunk-muenchen.de" port 10037', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10037', + '"gw03.freifunk-muenchen.de" port 10037', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10037', - '"gw04.freifunk-muenchen.de" port 10037', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10037', + '"gw04.freifunk-muenchen.de" port 10037', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10037', - '"gw05.freifunk-muenchen.de" port 10037', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10037', + '"gw05.freifunk-muenchen.de" port 10037', + }, }, }, }, diff --git a/extra/ffmuc19.conf b/extra/ffmuc19.conf index 6e05208..10f376c 100644 --- a/extra/ffmuc19.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10039', - '"gw01.freifunk-muenchen.de" port 10039', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10039', + '"gw01.freifunk-muenchen.de" port 10039', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10039', - '"gw02.freifunk-muenchen.de" port 10039', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10039', + '"gw02.freifunk-muenchen.de" port 10039', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10039', - '"gw03.freifunk-muenchen.de" port 10039', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10039', + '"gw03.freifunk-muenchen.de" port 10039', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10039', - '"gw04.freifunk-muenchen.de" port 10039', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10039', + '"gw04.freifunk-muenchen.de" port 10039', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10039', - '"gw05.freifunk-muenchen.de" port 10039', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10039', + '"gw05.freifunk-muenchen.de" port 10039', + }, }, }, }, diff --git a/extra/ffmuc20.conf b/extra/ffmuc20.conf index 56ec3f6..e68b50c 100644 --- a/extra/ffmuc20.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10040', - '"gw01.freifunk-muenchen.de" port 10040', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10040', + '"gw01.freifunk-muenchen.de" port 10040', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10040', - '"gw02.freifunk-muenchen.de" port 10040', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10040', + '"gw02.freifunk-muenchen.de" port 10040', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10040', - '"gw03.freifunk-muenchen.de" port 10040', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10040', + '"gw03.freifunk-muenchen.de" port 10040', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10040', - '"gw04.freifunk-muenchen.de" port 10040', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10040', + '"gw04.freifunk-muenchen.de" port 10040', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10040', - '"gw05.freifunk-muenchen.de" port 10040', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10040', + '"gw05.freifunk-muenchen.de" port 10040', + }, }, }, }, diff --git a/extra/ffmuc21.conf b/extra/ffmuc21.conf index a4125d9..66c646b 100644 --- a/extra/ffmuc21.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10041', - '"gw01.freifunk-muenchen.de" port 10041', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10041', + '"gw01.freifunk-muenchen.de" port 10041', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10041', - '"gw02.freifunk-muenchen.de" port 10041', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10041', + '"gw02.freifunk-muenchen.de" port 10041', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10041', - '"gw03.freifunk-muenchen.de" port 10041', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10041', + '"gw03.freifunk-muenchen.de" port 10041', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10041', - '"gw04.freifunk-muenchen.de" port 10041', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10041', + '"gw04.freifunk-muenchen.de" port 10041', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10041', - '"gw05.freifunk-muenchen.de" port 10041', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10041', + '"gw05.freifunk-muenchen.de" port 10041', + }, }, }, }, diff --git a/extra/ffmuc22.conf b/extra/ffmuc22.conf index 222859f..e736944 100644 --- a/extra/ffmuc22.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10042', - '"gw01.freifunk-muenchen.de" port 10042', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10042', + '"gw01.freifunk-muenchen.de" port 10042', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10042', - '"gw02.freifunk-muenchen.de" port 10042', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10042', + '"gw02.freifunk-muenchen.de" port 10042', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10042', - '"gw03.freifunk-muenchen.de" port 10042', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10042', + '"gw03.freifunk-muenchen.de" port 10042', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10042', - '"gw04.freifunk-muenchen.de" port 10042', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10042', + '"gw04.freifunk-muenchen.de" port 10042', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10042', - '"gw05.freifunk-muenchen.de" port 10042', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10042', + '"gw05.freifunk-muenchen.de" port 10042', + }, }, }, }, diff --git a/extra/ffmuc23.conf b/extra/ffmuc23.conf index 16cd410..03aab39 100644 --- a/extra/ffmuc23.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10043', - '"gw01.freifunk-muenchen.de" port 10043', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10043', + '"gw01.freifunk-muenchen.de" port 10043', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10043', - '"gw02.freifunk-muenchen.de" port 10043', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10043', + '"gw02.freifunk-muenchen.de" port 10043', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10043', - '"gw03.freifunk-muenchen.de" port 10043', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10043', + '"gw03.freifunk-muenchen.de" port 10043', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10043', - '"gw04.freifunk-muenchen.de" port 10043', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10043', + '"gw04.freifunk-muenchen.de" port 10043', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10043', - '"gw05.freifunk-muenchen.de" port 10043', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10043', + '"gw05.freifunk-muenchen.de" port 10043', + }, }, }, }, diff --git a/extra/ffmuc24.conf b/extra/ffmuc24.conf index 8b87146..a384d5e 100644 --- a/extra/ffmuc24.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10044', - '"gw01.freifunk-muenchen.de" port 10044', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10044', + '"gw01.freifunk-muenchen.de" port 10044', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10044', - '"gw02.freifunk-muenchen.de" port 10044', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10044', + '"gw02.freifunk-muenchen.de" port 10044', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10044', - '"gw03.freifunk-muenchen.de" port 10044', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10044', + '"gw03.freifunk-muenchen.de" port 10044', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10044', - '"gw04.freifunk-muenchen.de" port 10044', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10044', + '"gw04.freifunk-muenchen.de" port 10044', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10044', - '"gw05.freifunk-muenchen.de" port 10044', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10044', + '"gw05.freifunk-muenchen.de" port 10044', + }, }, }, }, diff --git a/extra/ffmuc25.conf b/extra/ffmuc25.conf index 64d5952..51b15aa 100644 --- a/extra/ffmuc25.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10045', - '"gw01.freifunk-muenchen.de" port 10045', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10045', + '"gw01.freifunk-muenchen.de" port 10045', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10045', - '"gw02.freifunk-muenchen.de" port 10045', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10045', + '"gw02.freifunk-muenchen.de" port 10045', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10045', - '"gw03.freifunk-muenchen.de" port 10045', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10045', + '"gw03.freifunk-muenchen.de" port 10045', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10045', - '"gw04.freifunk-muenchen.de" port 10045', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10045', + '"gw04.freifunk-muenchen.de" port 10045', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10045', - '"gw05.freifunk-muenchen.de" port 10045', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10045', + '"gw05.freifunk-muenchen.de" port 10045', + }, }, }, }, diff --git a/extra/ffmuc_land.conf b/extra/ffmuc_land.conf index 92aa4f3..f79837b 100644 --- a/extra/ffmuc_land.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10046', - '"gw01.freifunk-muenchen.de" port 10046', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10046', + '"gw01.freifunk-muenchen.de" port 10046', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10046', - '"gw02.freifunk-muenchen.de" port 10046', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10046', + '"gw02.freifunk-muenchen.de" port 10046', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10046', - '"gw03.freifunk-muenchen.de" port 10046', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10046', + '"gw03.freifunk-muenchen.de" port 10046', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10046', - '"gw04.freifunk-muenchen.de" port 10046', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10046', + '"gw04.freifunk-muenchen.de" port 10046', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10046', - '"gw05.freifunk-muenchen.de" port 10046', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10046', + '"gw05.freifunk-muenchen.de" port 10046', + }, }, }, }, diff --git a/extra/ffmuc_umland.conf b/extra/ffmuc_umland.conf index 8024c7a..b53d87a 100644 --- a/extra/ffmuc_umland.conf +++ b/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,44 +61,46 @@ }, 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, - groups = { - backbone = { - limit = 1, - peers = { - gwu01 = { - key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', - remotes = { - '"gwu01.ffmuc.net" port 10015', - '"gwu01.freifunk-muenchen.de" port 10015', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', + remotes = { + '"gwu01.ffmuc.net" port 10015', + '"gwu01.freifunk-muenchen.de" port 10015', + }, }, - }, - gwu02 = { - key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', - remotes = { - '"gwu02.ffmuc.net" port 10015', - '"gwu02.freifunk-muenchen.de" port 10015', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', + remotes = { + '"gwu02.ffmuc.net" port 10015', + '"gwu02.freifunk-muenchen.de" port 10015', + }, }, - }, - gwu03 = { - key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', - remotes = { - '"gwu03.ffmuc.net" port 10015', - '"gwu03.freifunk-muenchen.de" port 10015', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', + remotes = { + '"gwu03.ffmuc.net" port 10015', + '"gwu03.freifunk-muenchen.de" port 10015', + }, }, - }, - gwu04 = { - key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', - remotes = { - '"gwu04.ffmuc.net" port 10015', - '"gwu04.freifunk-muenchen.de" port 10015', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', + remotes = { + '"gwu04.ffmuc.net" port 10015', + '"gwu04.freifunk-muenchen.de" port 10015', + }, }, }, }, diff --git a/extra/ffmuc_welcome.conf b/extra/ffmuc_welcome.conf index ca29376..62757ae 100644 --- a/extra/ffmuc_welcome.conf +++ b/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,39 +66,41 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gwf01 = { - key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e', - remotes = { - '"gwf01.ffmuc.net" port 11001', - '"gwf01.freifunk-muenchen.de" port 11001', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gwf01 = { + key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e', + remotes = { + '"gwf01.ffmuc.net" port 11001', + '"gwf01.freifunk-muenchen.de" port 11001', + }, }, - }, - gwf02 = { - key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35', - remotes = { - '"gwf02.ffmuc.net" port 11001', - '"gwf02.freifunk-muenchen.de" port 11001', + gwf02 = { + key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35', + remotes = { + '"gwf02.ffmuc.net" port 11001', + '"gwf02.freifunk-muenchen.de" port 11001', + }, }, - }, - gwf03 = { - key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386', - remotes = { - '"gwf03.ffmuc.net" port 11001', - '"gwf03.freifunk-muenchen.de" port 11001', + gwf03 = { + key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386', + remotes = { + '"gwf03.ffmuc.net" port 11001', + '"gwf03.freifunk-muenchen.de" port 11001', + }, }, - }, - gwf04 = { - key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539', - remotes = { - '"gwf04.ffmuc.net" port 11001', - '"gwf04.freifunk-muenchen.de" port 11001', + gwf04 = { + key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539', + remotes = { + '"gwf04.ffmuc.net" port 11001', + '"gwf04.freifunk-muenchen.de" port 11001', + }, }, }, }, diff --git a/site.conf b/site.conf index f3f1e5b..dab101c 100644 --- a/site.conf +++ b/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,46 +66,48 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', - remotes = { - '"gw01.ffmuc.net" port 10001', - '"gw01.freifunk-muenchen.de" port 10001', + fastd = { + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 1, + peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10001', + '"gw01.freifunk-muenchen.de" port 10001', + }, }, - }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', - remotes = { - '"gw02.ffmuc.net" port 10001', - '"gw02.freifunk-muenchen.de" port 10001', + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10001', + '"gw02.freifunk-muenchen.de" port 10001', + }, }, - }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - '"gw03.ffmuc.net" port 10001', - '"gw03.freifunk-muenchen.de" port 10001', + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + '"gw03.ffmuc.net" port 10001', + '"gw03.freifunk-muenchen.de" port 10001', + }, }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - '"gw04.ffmuc.net" port 10001', - '"gw04.freifunk-muenchen.de" port 10001', + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + '"gw04.ffmuc.net" port 10001', + '"gw04.freifunk-muenchen.de" port 10001', + }, }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10001', - '"gw05.freifunk-muenchen.de" port 10001', + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + '"gw05.ffmuc.net" port 10001', + '"gw05.freifunk-muenchen.de" port 10001', + }, }, }, },