nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 504a38ef26 into d147c987c6

Browse Source
This commit is contained in:
Vincent Wiemann 2017-11-10 11:15:19 +00:00 committed by GitHub
commit e1a4173dd7
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/user/site.rst
View File

@ -213,6 +213,9 @@ mesh_vpn
You can set syslog_level from verbose (default) to warn to reduce syslog output. You can set syslog_level from verbose (default) to warn to reduce syslog output.
To make sure that old peer groups are not retained after sysupgrade (e.g. updating from firmware
from another community) set delete_old_peers to `true`.
The `tunneldigger` section is used to define the *tunneldigger* broker list. The `tunneldigger` section is used to define the *tunneldigger* broker list.
**Note:** It doesn't make sense to include both `fastd` and `tunneldigger` **Note:** It doesn't make sense to include both `fastd` and `tunneldigger`
@ -230,6 +233,7 @@ mesh_vpn
methods = {'salsa2012+umac'}, methods = {'salsa2012+umac'},
-- configurable = true, -- configurable = true,
-- syslog_level = 'warn', -- syslog_level = 'warn',
-- delete_old_peers = false,
groups = { groups = {
backbone = { backbone = {
-- Limit number of connected peers from this group -- Limit number of connected peers from this group

1
package/gluon-mesh-vpn-fastd/check_site.lua
View File

@ -1,6 +1,7 @@
local fastd_methods = {'salsa2012+gmac', 'salsa2012+umac', 'null+salsa2012+gmac', 'null+salsa2012+umac', 'null'} local fastd_methods = {'salsa2012+gmac', 'salsa2012+umac', 'null+salsa2012+gmac', 'null+salsa2012+umac', 'null'}
need_array_of('mesh_vpn.fastd.methods', fastd_methods) need_array_of('mesh_vpn.fastd.methods', fastd_methods)
need_boolean('mesh_vpn.fastd.configurable', false) need_boolean('mesh_vpn.fastd.configurable', false)
need_boolean('mesh_vpn.fastd.delete_old_peers', false)
need_one_of('mesh_vpn.fastd.syslog_level', {'error', 'warn', 'info', 'verbose', 'debug', 'debug2'}, false) need_one_of('mesh_vpn.fastd.syslog_level', {'error', 'warn', 'info', 'verbose', 'debug', 'debug2'}, false)

13
package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd Executable file → Normal file
View File

@ -92,6 +92,19 @@ function add_groups(prefix, groups, parent)
end end
end end
if site.mesh_vpn.fastd.delete_old_peers then
uci:delete_all('fastd', 'peer_group', function(group)
if group.net == 'mesh_vpn' then
uci:delete_all('fastd', 'peer', function(peer)
return (peer.group == group)
end)
return true
end
end)
end
add_groups('mesh_vpn', site.mesh_vpn.fastd.groups()) add_groups('mesh_vpn', site.mesh_vpn.fastd.groups())