diff --git a/site.conf b/site.conf index bd571cb..23506f8 100644 --- a/site.conf +++ b/site.conf @@ -4,7 +4,10 @@ site_code = 'ffrgb', opkg = { + --[[ old openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages', + ]] + lede = 'http://downloads.lede-project.org/snapshots/packages/%A', }, prefix4 = '10.90.0.0/19', @@ -18,6 +21,8 @@ regdom = 'DE', wifi24 = { + supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000}, + basic_rate = {6000, 9000, 18000, 36000, 54000}, channel = 1, ap = { ssid = 'regensburg.freifunk.net', @@ -52,40 +57,42 @@ mac = '16:41:95:40:f7:dd', }, - fastd_mesh_vpn = { - bandwidth_limit = { - enabled = false, - ingress = 12000, - egress = 1200, - }, - methods = {'salsa2012+umac'}, - configurable = true, + mesh_vpn = { mtu = 1426, - groups = { - backbone = { - limit = 2, - peers = { - gw01 = { --[[ sven ]] - key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66', - remotes = { - 'ipv4 "78.47.168.108" port 10000', + fastd = { + configurable = true, + methods = {'salsa2012+umac'}, + groups = { + backbone = { + limit = 2, + peers = { + gw01 = { --[[ sven ]] + key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66', + remotes = { + 'ipv4 "78.47.168.108" port 10000', + }, }, - }, - gw02 = { --[[ alamar ]] - key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214', - remotes = { - 'ipv4 "185.53.218.23" port 10000', + gw02 = { --[[ alamar ]] + key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214', + remotes = { + 'ipv4 "185.53.218.23" port 10000', + }, }, - }, - gw04 = { --[[ mephisto ]] - key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', - remotes = { - 'ipv4 "213.166.225.5" port 10000', + gw04 = { --[[ mephisto ]] + key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', + remotes = { + 'ipv4 "213.166.225.5" port 10000', + }, }, }, }, }, }, + bandwidth_limit = { + enabled = false, + ingress = 12000, + egress = 1200, + }, }, autoupdater = { diff --git a/site.mk b/site.mk index c072a3c..6e0a196 100644 --- a/site.mk +++ b/site.mk @@ -10,13 +10,10 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-contact-info \ gluon-ebtables-filter-multicast \ gluon-ebtables-filter-ra-dhcp \ - gluon-luci-admin \ - gluon-luci-autoupdater \ - gluon-luci-portconfig \ - gluon-luci-wifi-config \ - gluon-luci-private-wifi \ - gluon-luci-mesh-vpn-fastd \ - gluon-next-node \ + gluon-web-admin \ + gluon-web-autoupdater \ + gluon-web-network \ + gluon-web-wifi-config \ gluon-mesh-vpn-fastd \ gluon-radvd \ gluon-setup-mode \