Update site configs for 2017.1

This commit is contained in:
Franz Pletz
2017-07-12 10:41:54 +02:00
parent 6122b567c9
commit f274d51ea4
36 changed files with 1504 additions and 1252 deletions

View File

@@ -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',
},
},
},
},