Umstellung auf 802.11s, neue Fastd-Schlüssel, kleine optische Verbesserungen
parent
bc388cee6f
commit
9ad996a987
69
site.conf
69
site.conf
|
@ -11,7 +11,7 @@
|
||||||
prefix4 = '10.15.192.0/20',
|
prefix4 = '10.15.192.0/20',
|
||||||
prefix6 = 'fde8:21c6:370b::/64',
|
prefix6 = 'fde8:21c6:370b::/64',
|
||||||
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
|
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
|
||||||
ntp_servers = {'ntp.ffpr'},
|
ntp_servers = { 'ntp.ffpr' },
|
||||||
regdom = 'DE',
|
regdom = 'DE',
|
||||||
wifi24 = {
|
wifi24 = {
|
||||||
channel = 9,
|
channel = 9,
|
||||||
|
@ -19,55 +19,53 @@
|
||||||
ap = {
|
ap = {
|
||||||
ssid = 'prignitz.freifunk.net'
|
ssid = 'prignitz.freifunk.net'
|
||||||
},
|
},
|
||||||
ibss = {
|
mesh = {
|
||||||
ssid = '0a:00:ba:dc:ab:1e',
|
id = 'ff-prignitz-mesh',
|
||||||
bssid = '0a:00:ba:dc:ab:1e',
|
|
||||||
mcast_rate = 12000
|
mcast_rate = 12000
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
wifi5 = {
|
wifi5 = {
|
||||||
channel = 40,
|
channel = 40,
|
||||||
htmode = 'HT40+',
|
htmode = 'HT40+',
|
||||||
master = {
|
ap = {
|
||||||
ssid = 'prignitz.freifunk.net',
|
ssid = 'prignitz.freifunk.net'
|
||||||
},
|
|
||||||
ibss = {
|
|
||||||
ssid = '0a:00:ba:dc:ab:1e',
|
|
||||||
bssid = '0a:00:ba:dc:ab:1e',
|
|
||||||
mcast_rate = 12000,
|
|
||||||
},
|
},
|
||||||
|
mesh = {
|
||||||
|
id = 'ff-prignitz-mesh',
|
||||||
|
mcast_rate = 12000
|
||||||
|
}
|
||||||
},
|
},
|
||||||
next_node = {
|
next_node = {
|
||||||
ip4 = '10.15.192.1',
|
ip4 = '10.15.192.1',
|
||||||
ip6 = 'fde8:21c6:370b::1',
|
ip6 = 'fde8:21c6:370b::1',
|
||||||
mac = '16:41:95:40:f7:dc',
|
mac = '16:41:95:40:f7:dc'
|
||||||
},
|
},
|
||||||
fastd_mesh_vpn = {
|
fastd_mesh_vpn = {
|
||||||
methods = {'salsa2012+umac'},
|
methods = { 'salsa2012+umac' },
|
||||||
mtu = 1426,
|
mtu = 1426,
|
||||||
groups = {
|
groups = {
|
||||||
backbone = {
|
backbone = {
|
||||||
limit = 1,
|
limit = 1,
|
||||||
peers = {
|
peers = {
|
||||||
gate01 = {
|
gate01 = {
|
||||||
key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d',
|
key = '1ea68435d6676d3cd26693f1775eed5113c909a9b3d373dd71e7dd925ab95278',
|
||||||
remotes = {
|
remotes = {
|
||||||
'ipv4 "gate01.freifunk-prignitz.de" port 10000'
|
'ipv4 "gate01.freifunk-prignitz.de" port 10000'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
gate02 = {
|
gate02 = {
|
||||||
key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496',
|
key = '886380d6799e2c25f9b89739cab74b9294dec58372ecb7c3cf5bb8f07bd36227',
|
||||||
remotes = {
|
remotes = {
|
||||||
'ipv4 "gate02.freifunk-prignitz.de" port 10000'
|
'ipv4 "gate02.freifunk-prignitz.de" port 10000'
|
||||||
},
|
},
|
||||||
},
|
}
|
||||||
},
|
}
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
bandwidth_limit = {
|
bandwidth_limit = {
|
||||||
enabled = false,
|
enabled = false,
|
||||||
limit_ingress = 3000,
|
limit_ingress = 4096,
|
||||||
limit_egress = 200,
|
limit_egress = 512
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
autoupdater = {
|
autoupdater = {
|
||||||
|
@ -75,32 +73,32 @@
|
||||||
branches = {
|
branches = {
|
||||||
stable = {
|
stable = {
|
||||||
name = 'stable',
|
name = 'stable',
|
||||||
mirrors = {'http://updates.ffpr/stable/sysupgrade'},
|
mirrors = { 'http://updates.ffpr/stable/sysupgrade' },
|
||||||
good_signatures = 2,
|
good_signatures = 2,
|
||||||
pubkeys = {
|
pubkeys = {
|
||||||
'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
|
'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
|
||||||
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
|
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f' -- Thomas
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
beta = {
|
beta = {
|
||||||
name = 'beta',
|
name = 'beta',
|
||||||
mirrors = {'http://updates.ffpr/beta/sysupgrade'},
|
mirrors = { 'http://updates.ffpr/beta/sysupgrade' },
|
||||||
good_signatures = 2,
|
good_signatures = 2,
|
||||||
pubkeys = {
|
pubkeys = {
|
||||||
'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
|
'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
|
||||||
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
|
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f' -- Thomas
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
experimental = {
|
experimental = {
|
||||||
name = 'experimental',
|
name = 'experimental',
|
||||||
mirrors = {'http://updates.ffpr/experimental/sysupgrade'},
|
mirrors = { 'http://updates.ffpr/experimental/sysupgrade' },
|
||||||
good_signatures = 1,
|
good_signatures = 1,
|
||||||
pubkeys = {
|
pubkeys = {
|
||||||
'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
|
'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
|
||||||
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
|
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f' -- Thomas
|
||||||
},
|
}
|
||||||
},
|
}
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
roles = {
|
roles = {
|
||||||
default = 'node',
|
default = 'node',
|
||||||
|
@ -110,7 +108,12 @@
|
||||||
'mobile',
|
'mobile',
|
||||||
'offloader',
|
'offloader',
|
||||||
'service',
|
'service',
|
||||||
'test',
|
'test'
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
|
config_mode = {
|
||||||
|
geo_location = {
|
||||||
|
show_altitude = false
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue