treewide: use new gluon.site Lua library

Some files have received some additional refactoring.

package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn

 #!/usr/bin/lua
 
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 local users = require 'gluon.users'
 local util = require 'gluon.util'
 local fs = require 'nixio.fs'
@@ -14,7 +14,7 @@ uci:section('network', 'interface', 'mesh_vpn', {
 	transitive = true,
 	fixed_mtu = true,
 	macaddr = util.generate_mac(7),
-	mtu = site.mesh_vpn.mtu,
+	mtu = site.mesh_vpn.mtu(),
 })
 
 uci:save('network')
@@ -25,22 +25,12 @@ if fs.access('/etc/config/gluon-simple-tc') then
 end
 
 if not uci:get('simple-tc', 'mesh_vpn') then
-	local config = {
+	uci:section('simple-tc', 'interface', 'mesh_vpn', {
 		ifname = 'mesh-vpn',
-		enabled = false,
-	}
-
-
-	if site.mesh_vpn.bandwidth_limit then
-		if site.mesh_vpn.bandwidth_limit.enabled then
-			config.enabled = true
-		end
-
-		config.limit_ingress = site.mesh_vpn.bandwidth_limit.ingress
-		config.limit_egress = site.mesh_vpn.bandwidth_limit.egress
-	end
-
-	uci:section('simple-tc', 'interface', 'mesh_vpn', config)
+		enabled = site.mesh_vpn.bandwidth_limit.enabled(false),
+		limit_ingress = site.mesh_vpn.bandwidth_limit.ingress(),
+		limit_egress = site.mesh_vpn.bandwidth_limit.egress(),
+	})
 	uci:save('simple-tc')
 end
 
@@ -79,7 +69,7 @@ elseif fastd_enabled or tunneldigger_enabled then
 	enabled = fastd_enabled == '1' or tunneldigger_enabled == '1'
 -- If nothing is set, use the default
 else
-	enabled = site.mesh_vpn.enabled or false
+	enabled = site.mesh_vpn.enabled(false)
 end
 
 if has_fastd then

package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd

 #!/usr/bin/lua
 
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 local util = require 'gluon.util'
 
 local uci = require('simple-uci').cursor()
@@ -10,8 +10,8 @@ local syslog_level = uci:get('fastd', 'mesh_vpn', 'syslog_level') or 'verbose'
 
 local methods
 
-if site.mesh_vpn.fastd.configurable then
-	local has_null = util.contains(site.mesh_vpn.fastd.methods, 'null')
+if site.mesh_vpn.fastd.configurable(false) then
+	local has_null = util.contains(site.mesh_vpn.fastd.methods(), 'null')
 
 	local old_methods = uci:get('fastd', 'mesh_vpn', 'method')
 	if old_methods then
@@ -23,14 +23,14 @@ if site.mesh_vpn.fastd.configurable then
 		table.insert(methods, 'null')
 	end
 
-	for _, method in ipairs(site.mesh_vpn.fastd.methods) do
+	for _, method in ipairs(site.mesh_vpn.fastd.methods()) do
 		if method ~= 'null' then
 			table.insert(methods, method)
 		end
 	end
 
 else
-	methods = site.mesh_vpn.fastd.methods
+	methods = site.mesh_vpn.fastd.methods()
 end
 
 
@@ -39,7 +39,7 @@ uci:section('fastd', 'fastd', 'mesh_vpn', {
 	syslog_level = syslog_level,
 	interface = 'mesh-vpn',
 	mode = 'tap',
-	mtu = site.mesh_vpn.mtu,
+	mtu = site.mesh_vpn.mtu(),
 	secure_handshakes = true,
 	method = methods,
 	packet_mark = 1,
@@ -92,7 +92,7 @@ function add_groups(prefix, groups, parent)
 	end
 end
 
-add_groups('mesh_vpn', site.mesh_vpn.fastd.groups)
+add_groups('mesh_vpn', site.mesh_vpn.fastd.groups())
 
 
 uci:save('fastd')

package/gluon-mesh-vpn-tunneldigger/luasrc/lib/gluon/upgrade/400-mesh-vpn-tunneldigger

 #!/usr/bin/lua
 
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 local util = require 'gluon.util'
 
 local uci = require('simple-uci').cursor()
@@ -27,7 +27,7 @@ uci:section('tunneldigger', 'broker', 'mesh_vpn', {
 	bind_interface = 'br-wan',
 	group = 'gluon-mesh-vpn',
 	broker_selection = 'usage',
-	address = site.mesh_vpn.tunneldigger.brokers,
+	address = site.mesh_vpn.tunneldigger.brokers(),
 })
 
 uci:save('tunneldigger')

package/gluon-node-info/luasrc/lib/gluon/upgrade/510-node-info-role

 #!/usr/bin/lua
 
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 local uci = require('simple-uci').cursor()
 
 local config = 'gluon-node-info'
 local role = uci:get(config, uci:get_first(config, 'system'), 'role')
 
-if site.roles then
-  default_role = site.roles.default
-else
-  default_role = ''
-end
-
 if not role then
-  uci:set(config, uci:get_first(config, 'system'), 'role', default_role)
+	uci:set(config, uci:get_first(config, 'system'), 'role', site.roles.default(''))
 	uci:save(config)
 end

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S20network

@@ -46,7 +46,7 @@ init_switch() {
 start_service() {
 	prepare_config
 	init_switch
-	iw reg set "$(lua -e 'print(require("gluon.site_config").regdom)')"
+	iw reg set "$(lua -e 'print(require("gluon.site").regdom())')"
 
 	procd_open_instance
 	procd_set_param command /sbin/netifd -c /var/gluon/setup-mode/config

package/gluon-setup-mode/luasrc/lib/gluon/upgrade/300-setup-mode

 #!/usr/bin/lua
 
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 local uci = require('simple-uci').cursor()
 
 
-if site.setup_mode
-   and site.setup_mode.skip
-   and not uci:get_first('gluon-setup-mode', 'setup_mode', 'configured', false) then
+if site.setup_mode.skip(false) and not uci:get_first('gluon-setup-mode', 'setup_mode', 'configured', false) then
 	local name = uci:get_first("gluon-setup-mode", "setup_mode")
 	uci:set("gluon-setup-mode", name, "configured", true)
 	uci:save('gluon-setup-mode')
 end
-

package/gluon-web-admin/files/lib/gluon/web/view/admin/info.html

@@ -4,7 +4,7 @@
 	local lutil = require 'gluon.web.util'
 	local pretty_hostname = require 'pretty_hostname'
 
-	local site = require 'gluon.site_config'
+	local site = require 'gluon.site'
 	local sysconfig = require 'gluon.sysconfig'
 	local platform = require 'gluon.platform'
 	local util = require "gluon.util"
@@ -26,7 +26,7 @@
 		model = platform.get_model(),
 		version = util.trim(fs.readfile('/lib/gluon/gluon-version')),
 		release = util.trim(fs.readfile('/lib/gluon/release')),
-		site = site.site_name,
+		site = site.site_name(),
 		pubkey = 'n/a',
 	}
 

package/gluon-web-mesh-vpn-fastd/luasrc/lib/gluon/web/model/admin/mesh_vpn_fastd.lua

@@ -16,14 +16,14 @@ else
 end
 
 function mode:write(data)
-	local site = require 'gluon.site_config'
+	local site = require 'gluon.site'
 
 	local methods = {}
 	if data == 'performance' then
 		table.insert(methods, 'null')
 	end
 
-	for _, method in ipairs(site.mesh_vpn.fastd.methods) do
+	for _, method in ipairs(site.mesh_vpn.fastd.methods()) do
 		if method ~= 'null' then
 			table.insert(methods, method)
 		end

package/gluon-web-node-role/luasrc/lib/gluon/web/model/admin/noderole.lua

 local f, s, o
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 local uci = require("simple-uci").cursor()
 local config = 'gluon-node-info'
 
@@ -16,7 +16,7 @@ s = f:section(Section, nil, translate(
 
 o = s:option(ListValue, "role", translate("Role"))
 o.default = role
-for _, role in ipairs(site.roles.list) do
+for _, role in ipairs(site.roles.list()) do
 	o:value(role, translate('gluon-web-node-role:role:' .. role))
 end