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

manman-sync: make it smarter

Browse Source
This commit is contained in:
Maciej Krüger 2022-01-18 19:11:44 +01:00 committed by Alexander List
parent a36f9d7e2a
commit 3c769526c6
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
package/gluon-manman-sync/luasrc/usr/bin/manman-sync
View File

@ -192,9 +192,28 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then
-- check if anything changed since last time -- check if anything changed since last time
-- if yes, apply changes and do gluon-reload -- if yes, apply changes and do gluon-reload
local has_changes = false
-- Use this when changing something that needs a reload and/or rollback (not the hostname)
local function set(a, b, c, d, isbool)
local curval = isbool and uci:get_bool(a, b, c) or uci:get(a, b, c)
if curval ~= d then
uci:set(a, b, c, d)
print(' Value', a, b, c, 'changed to', d, 'was', curval)
has_changes = true
else
print(' Value', a, b, c, 'unchanged', d)
end
end
local has_tunnel = false
for _, net in ipairs(node.interfaces) do for _, net in ipairs(node.interfaces) do
local net_name = net.name local net_name = net.name
if net_name == 'tunnel' or net_name == 'vpn' or net_name == 'mesh_vpn' then
has_tunnel = true
end
local net_mapped = mappings[net_name] or net_name local net_mapped = mappings[net_name] or net_name
if not string.find(net_mapped, '_') then if not string.find(net_mapped, '_') then
net_mapped = 'mesh_' .. net_mapped net_mapped = 'mesh_' .. net_mapped
@ -203,9 +222,12 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then
local cidr = ip.new(net.ip, net.netmask):string() local cidr = ip.new(net.ip, net.netmask):string()
print('Syncing ' .. net_name .. ' as ' .. net_mapped .. ' to ' .. cidr) print('Syncing ' .. net_name .. ' as ' .. net_mapped .. ' to ' .. cidr)
uci:set('gluon-static-ip', net_mapped, 'ip4', cidr) set('gluon-static-ip', net_mapped, 'ip4', cidr)
end end
print('Syncing mesh vpn: ' .. (has_tunnel and 'on' or 'off'))
set('gluon', 'mesh_vpn', 'enabled', has_tunnel, true)
uci:set('gluon-manman-sync', 'sync', 'last_data', json.stringify(location)) uci:set('gluon-manman-sync', 'sync', 'last_data', json.stringify(location))
uci:save('system') uci:save('system')
@ -214,9 +236,13 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then
uci:save('gluon-node-info') uci:save('gluon-node-info')
os.execute('exec uci commit') os.execute('exec uci commit')
print('Applying changes...') if has_changes then
os.execute('exec gluon-reconfigure') print('Applying changes...')
os.execute('exec gluon-reload') os.execute('exec gluon-reconfigure')
os.execute('exec gluon-reload')
else
print('No settings changes, no reason to reload')
end
else else
print('manman-sync not enabled, skipping') print('manman-sync not enabled, skipping')
end end