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

Fixed upgrade/400-mesh-vpn-tunneldigger

Browse Source
This commit is contained in:
CyrusFox 2015-10-09 14:14:32 +02:00
parent eb2f511ad1
commit 6db68958c2
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/upgrade/400-mesh-vpn-tunneldigger
View File

@ -10,23 +10,27 @@ local lutil = require 'luci.util'
-- Group for iptables rule -- Group for iptables rule
users.add_group('gluon-tunneldigger', 900) users.add_group('gluon-tunneldigger', 900)
local enabled = uci:get('tunneldigger', 'broker', 'enabled') local enabled = uci:get_first('tunneldigger', 'broker', 'enabled')
if not enabled then if not enabled then
enabled = site.tunneldigger_mesh_vpn.enabled and 1 or 0 enabled = site.tunneldigger_mesh_vpn.enabled and 1 or 0
end end
uci:section('tunneldigger', 'broker', -- Delete old broker config section
uci:delete_all('tunneldigger', 'broker')
section = uci:add('tunneldigger', 'broker')
uci:section('tunneldigger', 'broker', section,
{ {
enabled = enabled, enabled = enabled,
uuid = util.node_id(), uuid = util.node_id(),
interface = 'mesh-vpn', interface = 'mesh-vpn',
bind_interface = 'br-wan', bind_interface = 'br-wan',
group = 'gluon-tunneldigger', group = 'gluon-tunneldigger',
address = site.tunneldigger_mesh_vpn.brokers,
} }
) )
uci:set("tunneldigger", "broker", "address", site.mesh_vpn_tunneldigger.brokers)
uci:save('tunneldigger') uci:save('tunneldigger')
uci:commit('tunneldigger') uci:commit('tunneldigger')
@ -36,13 +40,7 @@ uci:section('network', 'interface', 'mesh_vpn',
proto = 'batadv', proto = 'batadv',
mesh = 'bat0', mesh = 'bat0',
mesh_no_rebroadcast = 1, mesh_no_rebroadcast = 1,
} mtu = site.tunneldigger_mesh_vpn.mtu,
)
uci:section('network', 'device', 'mesh_vpn_dev',
{
ifname = 'mesh-vpn',
mtu = site.mesh_vpn_tunneldigger.mtu,
} }
) )