diff options
| -rw-r--r-- | core/src/sys.lua | 5 | ||||
| -rw-r--r-- | modules/admin-core/src/controller/admin/status.lua | 6 | ||||
| -rw-r--r-- | modules/admin-core/src/model/menu/00admin.lua | 3 | ||||
| -rw-r--r-- | modules/admin-core/src/view/admin_status/index.htm | 7 | ||||
| -rw-r--r-- | modules/admin-core/src/view/admin_status/syslog.htm | 5 | ||||
| -rw-r--r-- | modules/admin-core/src/view/admin_uci/changes.htm | 2 |
6 files changed, 27 insertions, 1 deletions
diff --git a/core/src/sys.lua b/core/src/sys.lua index 3766548932..debd8e94c7 100644 --- a/core/src/sys.lua +++ b/core/src/sys.lua @@ -122,6 +122,11 @@ function sysinfo() return s, m, r end +-- Reads the syslog +function syslog() + return exec("logread") +end + group = {} group.getgroup = posix.getgroup diff --git a/modules/admin-core/src/controller/admin/status.lua b/modules/admin-core/src/controller/admin/status.lua new file mode 100644 index 0000000000..fa9fe65bde --- /dev/null +++ b/modules/admin-core/src/controller/admin/status.lua @@ -0,0 +1,6 @@ +module("ffluci.controller.admin.status", package.seeall) + +function action_syslog() + local syslog = ffluci.sys.syslog() + ffluci.template.render("admin_status/syslog", {syslog=syslog}) +end
\ No newline at end of file diff --git a/modules/admin-core/src/model/menu/00admin.lua b/modules/admin-core/src/model/menu/00admin.lua index c48db19bd6..b21e5e338e 100644 --- a/modules/admin-core/src/model/menu/00admin.lua +++ b/modules/admin-core/src/model/menu/00admin.lua @@ -1,6 +1,9 @@ add("admin", "index", "Übersicht", 10) act("luci", "Oberfläche") +add("admin", "status", "Status", 20) +act("syslog", "Systemprotokoll") + add("admin", "system", "System", 30) act("packages", "Paketverwaltung") act("passwd", "Passwort ändern") diff --git a/modules/admin-core/src/view/admin_status/index.htm b/modules/admin-core/src/view/admin_status/index.htm new file mode 100644 index 0000000000..984093693d --- /dev/null +++ b/modules/admin-core/src/view/admin_status/index.htm @@ -0,0 +1,7 @@ +<%+header%> +<h1><%:status Status%></h1> +<p><%:status1 Hier finden sich Informationen über den aktuellen Status des Systems, beispielsweise +Prozessortakt, Speicherauslastung und Netzwerkschnittstellen.%></p> +<p><%:status2 Zusätzlich können hier Protokolldaten, des Kernels und diverser Systemdienste eingesehen werden, +um deren Zustand zu kontrollieren.%></p> +<%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/src/view/admin_status/syslog.htm b/modules/admin-core/src/view/admin_status/syslog.htm new file mode 100644 index 0000000000..905161be20 --- /dev/null +++ b/modules/admin-core/src/view/admin_status/syslog.htm @@ -0,0 +1,5 @@ +<%+header%> +<h1><%:status Status%></h1> +<h2><%:syslog Systemprotokoll%></h2> +<code><%=syslog%></code> +<%+footer%>
\ No newline at end of file diff --git a/modules/admin-core/src/view/admin_uci/changes.htm b/modules/admin-core/src/view/admin_uci/changes.htm index 3bbcd0e5fb..52efb45890 100644 --- a/modules/admin-core/src/view/admin_uci/changes.htm +++ b/modules/admin-core/src/view/admin_uci/changes.htm @@ -1,7 +1,7 @@ <%+header%> <h1><%:config Konfiguration%></h1> <h2><%:changes Änderungen%></h2> -<code><%=(ffluci.model.uci.changes() or "-")%></code> +<code><%=ffluci.model.uci.changes()%></code> <form class="inline" method="get" action="<%=controller%>/admin/uci/apply"> <input type="submit" value="<%:apply Anwenden%>" /> </form> |