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

manman tweaks

Browse Source
This commit is contained in:
Maciej Krüger 2021-12-15 09:10:05 +01:00 committed by Alexander List
parent 4dcf3e0212
commit 0810a08519
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-config-mode-manman-sync/i18n/de.po
View File

@ -19,7 +19,7 @@ msgid "ManMan location ID"
msgstr "ManMan Standort-ID" msgstr "ManMan Standort-ID"
msgid "" msgid ""
"Sync data from ManMan by entering ManMan location id here.\n" "Sync configuration from ManMan by entering ManMan location id here.\n"
"This will automatically keep name, location and ips in sync with the values " "This will automatically keep name, location and ips in sync with the values "
"specified in ManMan." "specified in ManMan."
msgstr "" msgstr ""

2
package/gluon-config-mode-manman-sync/i18n/gluon-config-mode-manman-sync.pot
View File

@ -8,7 +8,7 @@ msgid "ManMan location ID"
msgstr "" msgstr ""
msgid "" msgid ""
"Sync data from ManMan " "Sync configuration from ManMan "
"by entering ManMan location id here.\n" "by entering ManMan location id here.\n"
"This will automatically keep name, location and ips " "This will automatically keep name, location and ips "
"in sync with the values specified in ManMan." "in sync with the values specified in ManMan."

4
package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua
View File

@ -6,8 +6,8 @@ return function(form, uci)
local pkg_i18n = i18n 'gluon-config-mode-manman-sync' local pkg_i18n = i18n 'gluon-config-mode-manman-sync'
local msg = pkg_i18n.translate( local msg = pkg_i18n.translate(
'Sync data from ManMan ' .. 'Sync configuration from ManMan ' ..
'by entering ManMan location id here.\n' .. 'by entering ManMan location id here.\n' ..
'This will automatically keep name, location and ips ' .. 'This will automatically keep name, location and ips ' ..
'in sync with the values specified in ManMan.' 'in sync with the values specified in ManMan.'
) )

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

@ -12,12 +12,16 @@ local mappings = {
} }
if uci:get_bool('gluon', 'manman_sync', 'enabled') then if uci:get_bool('gluon', 'manman_sync', 'enabled') then
if not uci:get('gluon', 'manman_sync', 'location_id') then local location_id = uci:get('gluon', 'manman_sync', 'location_id')
if not location_id then
print('E: manman location_id missing') print('E: manman location_id missing')
return 2 return 2
end end
-- check manman location, abort if not reachable -- check manman reachability, abort if not reachable
-- get location from ip
location = getLocation() location = getLocation()
print('Syncing with location ' .. location['name']) print('Syncing with location ' .. location['name'])
@ -48,7 +52,10 @@ if uci:get_bool('gluon', 'manman_sync', 'enabled') then
for index, net in ipairs(device['networks']) do for index, net in ipairs(device['networks']) do
net_name = net['name'] net_name = net['name']
net_mapped = 'mesh_' .. (mappings[net_name] or net_name) net_mapped = mappings[net_name] or net_name
if not string.find(net_mapped, '_') then
net_mapped = 'mesh_' .. net_mapped
end
cidr = ip.new(net['ip'], net['netmask']):string() cidr = ip.new(net['ip'], net['netmask']):string()
@ -57,6 +64,7 @@ if uci:get_bool('gluon', 'manman_sync', 'enabled') then
end end
-- TODO: exec gluon-reload -- TODO: exec gluon-reload
print('Reloading...')
else else
print('manman-sync not enabled, skipping') print('manman-sync not enabled, skipping')
end end