X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_system%2Fsystem.lua;h=5e82289bd89a66118869f98ddbd12618be1b899f;hb=9edd0e46c3f880727738ce8ca6ff1c8b85f99ef4;hp=f2e83401e00e9411d12f6cf9afaead606118a690;hpb=19f94464c6a172a98520f702ece4d0ecdb0828ce;p=oweals%2Fluci.git
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index f2e83401e..5e82289bd 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -19,17 +19,12 @@ require("luci.tools.webadmin")
require("luci.fs")
require("luci.config")
+local m, s, o
+local has_ntpd = luci.fs.access("/usr/sbin/ntpd")
+
m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
m:chain("luci")
-local has_rdate = false
-
-m.uci:foreach("system", "rdate",
- function()
- has_rdate = true
- return false
- end)
-
s = m:section(TypedSection, "system", translate("System Properties"))
s.anonymous = true
@@ -44,52 +39,27 @@ s:tab("language", translate("Language and Style"))
-- System Properties
--
-local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
-local uptime = luci.sys.uptime()
-
-s:taboption("general", DummyValue, "_system", translate("System")).value = system
-s:taboption("general", DummyValue, "_cpu", translate("Processor")).value = model
-
-s:taboption("general", DummyValue, "_kernel", translate("Kernel")).value =
- luci.util.exec("uname -r") or "?"
+o = s:taboption("general", DummyValue, "_systime", translate("Local Time"))
+o.template = "admin_system/clock_status"
-local load1, load5, load15 = luci.sys.loadavg()
-s:taboption("general", DummyValue, "_la", translate("Load")).value =
- string.format("%.2f, %.2f, %.2f", load1, load5, load15)
-s:taboption("general", DummyValue, "_memtotal", translate("Memory")).value =
- string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
- tonumber(memtotal) / 1024,
- 100 * memcached / memtotal,
- tostring(translate("cached")),
- 100 * membuffers / memtotal,
- tostring(translate("buffered")),
- 100 * memfree / memtotal,
- tostring(translate("free"))
-)
+o = s:taboption("general", Value, "hostname", translate("Hostname"))
+o.datatype = "hostname"
-s:taboption("general", DummyValue, "_systime", translate("Local Time")).value =
- os.date("%c")
-
-s:taboption("general", DummyValue, "_uptime", translate("Uptime")).value =
- luci.tools.webadmin.date_format(tonumber(uptime))
-
-hn = s:taboption("general", Value, "hostname", translate("Hostname"))
-hn.datatype = "hostname"
-function hn.write(self, section, value)
+function o.write(self, section, value)
Value.write(self, section, value)
luci.sys.hostname(value)
end
-tz = s:taboption("general", ListValue, "zonename", translate("Timezone"))
-tz:value("UTC")
+o = s:taboption("general", ListValue, "zonename", translate("Timezone"))
+o:value("UTC")
for i, zone in ipairs(luci.sys.zoneinfo.TZ) do
- tz:value(zone[1])
+ o:value(zone[1])
end
-function tz.write(self, section, value)
+function o.write(self, section, value)
local function lookup_zone(title)
for _, zone in ipairs(luci.sys.zoneinfo.TZ) do
if zone[1] == title then return zone[2] end
@@ -180,88 +150,79 @@ end
--
--- Rdate
+-- NTP
--
-if has_rdate then
- m3= Map("timeserver", translate("Time Server (rdate)"))
- s = m3:section(TypedSection, "timeserver")
- s.anonymous = true
- s.addremove = true
- s.template = "cbi/tblsection"
-
- h = s:option(Value, "hostname", translate("Name"))
- h.rmempty = true
- h.datatype = host
- i = s:option(ListValue, "interface", translate("Interface"))
- i.rmempty = true
- i:value("", translate("Default"))
- m3.uci:foreach("network", "interface",
- function (section)
- local ifc = section[".name"]
- if ifc ~= "loopback" then
- i:value(ifc)
- end
- end
- )
-end
+if has_ntpd then
+
+ -- timeserver setup was requested, create section and reload page
+ if m:formvalue("cbid.system._timeserver._enable") then
+ m.uci:section("system", "timeserver", "ntp",
+ {
+ server = { "0.openwrt.pool.ntp.org", "1.openwrt.pool.ntp.org", "2.openwrt.pool.ntp.org", "3.openwrt.pool.ntp.org" }
+ }
+ )
+
+ m.uci:save("system")
+ luci.http.redirect(luci.dispatcher.build_url("admin/system", arg[1]))
+ return
+ end
+ local has_section = false
+ m.uci:foreach("system", "timeserver",
+ function(s)
+ has_section = true
+ return false
+ end)
-m2 = Map("luci")
+ if not has_section then
-f = m2:section(NamedSection, "main", "core", translate("Files to be kept when flashing a new firmware"))
+ s = m:section(TypedSection, "timeserver", translate("Time Synchronization"))
+ s.anonymous = true
+ s.cfgsections = function() return { "_timeserver" } end
-f:tab("detected", translate("Detected Files"),
- translate("The following files are detected by the system and will be kept automatically during sysupgrade"))
+ x = s:option(Button, "_enable")
+ x.title = translate("Time Synchronization is not configured yet.")
+ x.inputtitle = translate("Set up Time Synchronization")
+ x.inputstyle = "apply"
-f:tab("custom", translate("Custom Files"),
- translate("This is a list of shell glob patterns for matching files and directories to include during sysupgrade"))
+ else
+
+ s = m:section(TypedSection, "timeserver", translate("Time Synchronization"))
+ s.anonymous = true
+ s.addremove = false
-d = f:taboption("detected", DummyValue, "_detected", translate("Detected files"))
-d.rawhtml = true
-d.cfgvalue = function(s)
- local list = io.popen(
- "( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' /etc/sysupgrade.conf " ..
- "/lib/upgrade/keep.d/* 2>/dev/null) -type f 2>/dev/null; " ..
- "opkg list-changed-conffiles ) | sort -u"
- )
+ o = s:option(Flag, "enable", translate("Enable NTP client"))
+ o.rmempty = false
- if list then
- local files = { "" }
+ function o.cfgvalue(self)
+ return luci.sys.init.enabled("sysntpd")
+ and self.enabled or self.disabled
+ end
- while true do
- local ln = list:read("*l")
- if not ln then
- break
+ function o.write(self, section, value)
+ if value == self.enabled then
+ luci.sys.init.enable("sysntpd")
+ luci.sys.call("env -i /etc/init.d/sysntpd start >/dev/null")
else
- files[#files+1] = "- "
- files[#files+1] = luci.util.pcdata(ln)
- files[#files+1] = "
"
+ luci.sys.call("env -i /etc/init.d/sysntpd stop >/dev/null")
+ luci.sys.init.disable("sysntpd")
end
end
- list:close()
- files[#files+1] = "
"
- return table.concat(files, "")
- end
+ o = s:option(Flag, "enable_server", translate("Provide NTP server"))
+ o:depends("enable", "1")
- return "" .. translate("No files found") .. ""
-end
-c = f:taboption("custom", TextValue, "_custom", translate("Custom files"))
-c.rmempty = false
-c.cols = 70
-c.rows = 30
+ o = s:option(DynamicList, "server", translate("NTP server candidates"))
+ o.datatype = "host"
+ o:depends("enable", "1")
-c.cfgvalue = function(self, section)
- return nixio.fs.readfile("/etc/sysupgrade.conf")
-end
+ -- retain server list even if disabled
+ function o.remove() end
-c.write = function(self, section, value)
- value = value:gsub("\r\n?", "\n")
- return nixio.fs.writefile("/etc/sysupgrade.conf", value)
+ end
end
-
-return m, m3 or m2, m3 and m2
+return m