treewide: use new gluon.site Lua library

ffho/ffho-ath9k-blackout-workaround/luasrc/lib/gluon/upgrade/900-ath9k-blackout-workaround

@@ -1,9 +1,9 @@
 #!/usr/bin/lua
 
 local fs = require 'nixio.fs'
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 
-local step_size = site.ath9k_workaround.step_size
+local step_size = site.ath9k_workaround.step_size()
 
 local f = io.open('/usr/lib/micron.d/ath9k-blackout-workaround', 'w')
 f:write(string.format('*/%i * * * * /usr/sbin/ath9k-blackout-workaround\n', step_size))

ffho/ffho-ath9k-blackout-workaround/luasrc/usr/sbin/ath9k-blackout-workaround

@@ -2,7 +2,7 @@
 local fs = require 'nixio.fs'
 local uci = require('simple-uci').cursor()
 local iwinfo = require 'iwinfo'
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 
 local fileOk = '/tmp/ath9k-ok'
 local fileReset = '/tmp/ath9k-reset'
@@ -50,8 +50,8 @@ if check_wifi() or not fs.readfile(fileOk) then
   os.exit(0)
 end
 
-local blackout_wait_secs = site.ath9k_workaround.blackout_wait * 60
-local reset_wait_secs = site.ath9k_workaround.reset_wait * 60
+local blackout_wait_secs = site.ath9k_workaround.blackout_wait() * 60
+local reset_wait_secs = site.ath9k_workaround.reset_wait() * 60
 
 if os.difftime(os.time(), tonumber(fs.readfile(fileReset))) <= reset_wait_secs then
   os.exit(0)

ffho/ffho-autoupdater-wifi-fallback/luasrc/usr/sbin/autoupdater-wifi-fallback

@@ -1,7 +1,6 @@
 #!/usr/bin/lua
 local fs = require 'nixio.fs'
 local uci = require('simple-uci').cursor()
-local site = require 'gluon.site_config'
 local autil = require 'autoupdater-wifi-fallback.util'
 local util = require 'gluon.util'
 

ffho/ffho-config-mode-site-select/luasrc/lib/gluon/config-mode/wizard/0200-site-select.lua

@@ -1,5 +1,5 @@
 return function(form, uci)
-	local default = require 'gluon.site_config'
+	local default = require 'gluon.site'
 	local tools = require 'gluon.site_generate'
 
 	local sites = tools.get_config('/lib/gluon/site-select/sites.json')
@@ -10,7 +10,7 @@ return function(form, uci)
 	o.optional = false
 
 	if uci:get_bool('gluon-setup-mode', uci:get_first('gluon-setup-mode','setup_mode'), 'configured')  then
-		o:value(default.site_code, default.site_name)
+		o:value(default.site_code(), default.site_name())
 	else
 		o:value('')
 	end
@@ -26,7 +26,7 @@ return function(form, uci)
 			tools.set_site_code(data, false)
 		end
 
-		if data ~= default.site_code then
+		if data ~= default.site_code() then
 			os.execute('sh "/lib/gluon/site-select/site-upgrade"')
 		end
 	end

ffho/ffho-debug/luasrc/bin/ffho-debug

@@ -9,7 +9,7 @@ local json = require('luci.jsonc')
 local uci = require('simple-uci').cursor()
 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'
@@ -104,7 +104,7 @@ if oldReport==nil then
 	-- first of all, collect some generic information about the system
 	debugdata = debugdata .. "---- BEGIN SYSTEM INFORMATION ----\n"
 	debugdata = debugdata .. "Hostname:    " .. hostname .. "\n"
-	debugdata = debugdata .. "Community:   " .. site.site_name .. "\n"
+	debugdata = debugdata .. "Community:   " .. site.site_name() .. "\n"
 	debugdata = debugdata .. "Model:       " .. model .. "\n"
 	debugdata = debugdata .. "Firmware:    " .. release .. " / " .. version .. "\n"
 	debugdata = debugdata .. "MAC:         " .. primary_mac .. "\n"
@@ -237,8 +237,8 @@ else
 	print('-- My User has information that could... that could make this a free system again!')
 	local sent = 0
 	local reportname = nil
-	local port = site.debugserver.port
-	for _, host in ipairs(site.debugserver.host) do
+	local port = site.debugserver.port()
+	for _, host in ipairs(site.debugserver.host()) do
 		print('Trying to deliver debug-report to: ' .. host)
 		local sock = nixio.connect(host, port, "inet6", "stream")
 		if sock then

ffho/ffho-site-generate/luasrc/lib/gluon/upgrade/005-set-site-config

@@ -1,7 +1,7 @@
 #!/usr/bin/lua
 
 local uci = require('simple-uci').cursor()
-local site_code = require('gluon.site_config').site_code
+local site_code = require('gluon.site').site_code()
 local tools = require 'gluon.site_generate'
 
 local groups = tools.get_config('/lib/gluon/site-select/groups.json')