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

Gluon-core: Allow multiple domain names for next_node-feature

Browse Source 
* change type from next_node.names
* create domain entry for each entry and add to dnsmasq configuration
This commit is contained in:
Christof Schulze 2018-01-29 08:21:47 +01:00
parent bc75ce5c86
commit 728130004c
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/site-example/site.conf
View File

@ -83,6 +83,7 @@
-- connected to using a known IP address. -- connected to using a known IP address.
next_node = { next_node = {
-- anycast IPs of all nodes -- anycast IPs of all nodes
-- name = { 'nextnode.location.community.example.org', 'nextnode', 'nn' },
ip4 = '10.xxx.0.xxx', ip4 = '10.xxx.0.xxx',
ip6 = 'fdxx:xxxx:xxxx::xxxx', ip6 = 'fdxx:xxxx:xxxx::xxxx',
}, },

4
docs/user/site.rst
View File

@ -163,6 +163,7 @@ next_node \: package
:: ::
next_node = { next_node = {
name = { 'nextnode.location.community.example.org', 'nextnode', 'nn' },
ip4 = '10.23.42.1', ip4 = '10.23.42.1',
ip6 = 'fdca:ffee:babe:1::1', ip6 = 'fdca:ffee:babe:1::1',
mac = '16:41:95:40:f7:dc' mac = '16:41:95:40:f7:dc'
@ -172,7 +173,8 @@ next_node \: package
omitted, there will be no IPv4 or IPv6 anycast address. The MAC address omitted, there will be no IPv4 or IPv6 anycast address. The MAC address
defaults to ``16:41:95:40:f7:dc``; this value usually doesn't need to be defaults to ``16:41:95:40:f7:dc``; this value usually doesn't need to be
changed, but it can be adjusted to match existing deployments that use a changed, but it can be adjusted to match existing deployments that use a
different value. different value. Each entry in the ``name``-field will be resolved as the
ipv4 and ipv6-address.
mesh \: optional mesh \: optional
Options specific to routing protocols. Options specific to routing protocols.

6
package/gluon-core/check_site.lua
View File

@ -70,6 +70,12 @@ if need_table({'dns'}, nil, false) then
need_number({'dns', 'cacheentries'}, false) need_number({'dns', 'cacheentries'}, false)
end end
if need_table('next_node', nil, false) then
need_string_match('next_node.ip6', '^[%x:]+$', false)
need_string_match('next_node.ip4', '^%d+.%d+.%d+.%d+$', false)
need_string_array('next_node.name', false)
end
need_string_match(in_domain({'next_node', 'ip6'}), '^[%x:]+$', false) need_string_match(in_domain({'next_node', 'ip6'}), '^[%x:]+$', false)
need_string_match(in_domain({'next_node', 'ip4'}), '^%d+.%d+.%d+.%d+$', false) need_string_match(in_domain({'next_node', 'ip4'}), '^%d+.%d+.%d+.%d+$', false)

29
package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config
View File

@ -25,22 +25,25 @@ if dns.servers then
}) })
end end
if next_node.name and next_node.ip4 then local function set_dns_record(name, ip, sectionname)
uci:section('dhcp', 'domain', 'nextnode4', { if not ip then return end
name = next_node.name, uci:section('dhcp', 'domain', sectionname, {
ip = next_node.ip4, name = name,
ip = ip,
}) })
else
uci:delete('dhcp', 'domain', 'nextnode4')
end end
if next_node.name and next_node.ip6 then uci:foreach("dhcp", "domain", function(s)
uci:section('dhcp', 'domain', 'nextnode6', { for key, value in pairs(s) do
name = next_node.name, if (key == ".name" and string.gmatch(value, "^nextnode[46]")) then
ip = next_node.ip6, uci:delete("dhcp", value)
}) end
else end
uci:delete('dhcp', 'domain', 'nextnode6') end)
for i, name in ipairs(next_node.name or {}) do
set_dns_record(name, next_node.ip4, 'nextnode4_' .. i)
set_dns_record(name, next_node.ip6, 'nextnode6_' .. i)
end end
uci:save('dhcp') uci:save('dhcp')