site.conf: cleanup + airtime
This commit is contained in:
parent
8e78a6a2f1
commit
e8128d045f
2
modules
2
modules
|
@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffhb'
|
||||||
|
|
||||||
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
|
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
|
||||||
PACKAGES_FFHB_BRANCH=breminale2016
|
PACKAGES_FFHB_BRANCH=breminale2016
|
||||||
PACKAGES_FFHB_COMMIT=a1550c4dc2eca7058004fd3ee9f506761f61dc33
|
PACKAGES_FFHB_COMMIT=31768f0df1083819967857d843366b19ef86f0d9
|
||||||
|
|
126
site.conf
126
site.conf
|
@ -21,23 +21,14 @@
|
||||||
'5.ntp.bremen.freifunk.net',
|
'5.ntp.bremen.freifunk.net',
|
||||||
'6.ntp.bremen.freifunk.net',
|
'6.ntp.bremen.freifunk.net',
|
||||||
},
|
},
|
||||||
regdom = 'DE',
|
regdom = 'US',
|
||||||
|
|
||||||
wifi24 = {
|
wifi24 = {
|
||||||
channel = 6,
|
channel = 6,
|
||||||
htmode = 'HT20',
|
htmode = 'HT20',
|
||||||
ap = {
|
ap = {
|
||||||
ssid = 'bremen.freifunk.net',
|
ssid = 'freifunk.net',
|
||||||
},
|
},
|
||||||
--ibss = {
|
|
||||||
-- ssid = 'mesh.ffhb.de',
|
|
||||||
-- bssid = '32:06:1C:1F:B9:E8',
|
|
||||||
-- mcast_rate = 6000,
|
|
||||||
--},
|
|
||||||
--mesh = {
|
|
||||||
-- id = 'mesh.ffhb.de',
|
|
||||||
-- mcast_rate = 6000,
|
|
||||||
--},
|
|
||||||
},
|
},
|
||||||
wifi5 = {
|
wifi5 = {
|
||||||
channel = 44,
|
channel = 44,
|
||||||
|
@ -45,15 +36,6 @@
|
||||||
ap = {
|
ap = {
|
||||||
ssid = 'bremen.freifunk.net',
|
ssid = 'bremen.freifunk.net',
|
||||||
},
|
},
|
||||||
--ibss = {
|
|
||||||
-- ssid = 'mesh.ffhb.de',
|
|
||||||
-- bssid = '32:06:1C:1F:B9:E8',
|
|
||||||
-- mcast_rate = 6000,
|
|
||||||
--},
|
|
||||||
--mesh = {
|
|
||||||
-- id = 'mesh.ffhb.de',
|
|
||||||
-- mcast_rate = 6000,
|
|
||||||
--},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
next_node = {
|
next_node = {
|
||||||
|
@ -61,108 +43,4 @@
|
||||||
ip6 = '2a06:8782:ffbb:1337::127',
|
ip6 = '2a06:8782:ffbb:1337::127',
|
||||||
mac = '16:41:95:40:f7:dc',
|
mac = '16:41:95:40:f7:dc',
|
||||||
},
|
},
|
||||||
|
|
||||||
fastd_mesh_vpn = {
|
|
||||||
methods = {'salsa2012+umac','salsa2012+gmac'},
|
|
||||||
mtu = 1280,
|
|
||||||
groups = {
|
|
||||||
backbone = {
|
|
||||||
limit = 1,
|
|
||||||
peers = {
|
|
||||||
vpn01 = {
|
|
||||||
key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
|
|
||||||
remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'},
|
|
||||||
},
|
|
||||||
vpn02 = {
|
|
||||||
key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
|
|
||||||
remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'},
|
|
||||||
},
|
|
||||||
vpn03 = {
|
|
||||||
key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
|
|
||||||
remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'},
|
|
||||||
},
|
|
||||||
vpn04 = {
|
|
||||||
key = '3bccdc49d16fdfd791715c96e3e5d2a28d5dc4c115ac2ea864208b0546acdada',
|
|
||||||
remotes = {'"vpn04.bremen.freifunk.net" port 50000', '"vpn04.ffhb.de" port 50000'},
|
|
||||||
},
|
|
||||||
vpn05 = {
|
|
||||||
key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9',
|
|
||||||
remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'},
|
|
||||||
},
|
|
||||||
vpn06 = {
|
|
||||||
key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3',
|
|
||||||
remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
opkg = {
|
|
||||||
extra = {
|
|
||||||
modules = 'http://downloads.bremen.freifunk.net/opkg/modules/gluon-%GS-%GR/%S',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
autoupdater = {
|
|
||||||
branch = 'nightly',
|
|
||||||
branches = {
|
|
||||||
nightly = {
|
|
||||||
name = 'nightly',
|
|
||||||
mirrors = {
|
|
||||||
'http://downloads.bremen.freifunk.net/firmware/nightly/sysupgrade',
|
|
||||||
},
|
|
||||||
good_signatures = 1,
|
|
||||||
pubkeys = {
|
|
||||||
'4bc6c2c3f36f984a9c370558a453d8a91933323679dd6dbbf6568834133a6030', -- autobuilder
|
|
||||||
},
|
|
||||||
},
|
|
||||||
testing = {
|
|
||||||
name = 'testing',
|
|
||||||
mirrors = {
|
|
||||||
'http://downloads.bremen.freifunk.net/firmware/testing/sysupgrade',
|
|
||||||
},
|
|
||||||
good_signatures = 1,
|
|
||||||
pubkeys = {
|
|
||||||
'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza
|
|
||||||
'5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny
|
|
||||||
'99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt
|
|
||||||
'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver
|
|
||||||
'b3d1fe3851f4c70b1eda7103fd835d56f3a5dc7f057b6730f83d895332a9caa2', -- janeric
|
|
||||||
'6758e2e1e67766176482f5cb579f432dfc97206f3bd4fa6c16df19d5569873b6', -- ec8or
|
|
||||||
'bb003a1748fcea1eab8974ec8cb61615fd4dc42fab1f5bcb8334243849561b2d', -- ProXyhb
|
|
||||||
},
|
|
||||||
},
|
|
||||||
stable = {
|
|
||||||
name = 'stable',
|
|
||||||
mirrors = {
|
|
||||||
'http://downloads.bremen.freifunk.net/firmware/stable/sysupgrade',
|
|
||||||
},
|
|
||||||
good_signatures = 2,
|
|
||||||
pubkeys = {
|
|
||||||
'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza
|
|
||||||
'5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny
|
|
||||||
'99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt
|
|
||||||
'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver
|
|
||||||
'b3d1fe3851f4c70b1eda7103fd835d56f3a5dc7f057b6730f83d895332a9caa2', -- janeric
|
|
||||||
'6758e2e1e67766176482f5cb579f432dfc97206f3bd4fa6c16df19d5569873b6', -- ec8or
|
|
||||||
'bb003a1748fcea1eab8974ec8cb61615fd4dc42fab1f5bcb8334243849561b2d', -- ProXyhb
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
autoupdater_switcher = {
|
|
||||||
date = '20140324',
|
|
||||||
branch = 'testing',
|
|
||||||
},
|
|
||||||
|
|
||||||
simple_tc = {
|
|
||||||
mesh_vpn = {
|
|
||||||
ifname = "mesh-vpn",
|
|
||||||
enabled = true,
|
|
||||||
limit_egress = 500,
|
|
||||||
limit_ingress = 8000,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue