From 8b44052f3210ffaca4b4e51506b5eec295f16fda Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Wed, 9 Jan 2008 08:53:18 +0000 Subject: Designing graphics/ideas on syslog git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@518 ab2d0c66-481e-0410-8bed-d214d4d58bed --- syslog-basic-html.lsp | 47 ------------------------------------- syslog-config-html.lsp | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ syslog-controller.lua | 22 ++++++++++-------- syslog-expert-html.lsp | 12 ++++++++++ syslog-model.lua | 5 ++-- syslog-status-html.lsp | 25 ++++++++++++++++++++ syslog.menu | 2 +- 7 files changed, 116 insertions(+), 60 deletions(-) delete mode 100644 syslog-basic-html.lsp create mode 100644 syslog-config-html.lsp create mode 100644 syslog-expert-html.lsp create mode 100644 syslog-status-html.lsp diff --git a/syslog-basic-html.lsp b/syslog-basic-html.lsp deleted file mode 100644 index 0e5cab3..0000000 --- a/syslog-basic-html.lsp +++ /dev/null @@ -1,47 +0,0 @@ - -

System logging

-
-

-/> -Enable -

-

-/> -Disable -

- -

-/> -Enable remote logging -

- -

-Remote host: -

- -

-
- -

- -
diff --git a/syslog-config-html.lsp b/syslog-config-html.lsp new file mode 100644 index 0000000..0ced54f --- /dev/null +++ b/syslog-config-html.lsp @@ -0,0 +1,63 @@ + +

System logging

+

System info

+
+
Process status
+
+ +
Daemon control
+
+ + +
+ + +

Configuration

+ +

General settings

+ +
Log to given file
+
+

(default=/var/log/messages)

+ +
Set local log level
+
1 +2 +3 +4 +5 +

(1=Quiet, 5=Noisy)

+
+ +
Smaller logging output
+
+ +

Save logs for a longer period

+
Max size (KB) before rotate
+
+

(default=200KB, 0=off)

+
+ +
Number of rotated logs to keep
+
+

(default=1, max=99, 0=purge)

+
+ +

Remote logging

+ +
Log to IP or hostname on PORT
+

(default PORT=514/UDP)

+ +

Save above settings

+
Apply settings
+
+ + + + diff --git a/syslog-controller.lua b/syslog-controller.lua index be3e322..76089fb 100644 --- a/syslog-controller.lua +++ b/syslog-controller.lua @@ -1,7 +1,7 @@ module(..., package.seeall) -require("privsep") +--require("privsep") require("join") -- those should go into acf.conf @@ -11,19 +11,20 @@ local group="nobody" -- drop privileges and put privileged model funcs in self.priv mvc = {} function mvc.on_load(self) - self.priv = privsep.drop_privs(user, group, self.model.priv) +-- self.priv = privsep.drop_privs(user, group, self.model.priv) end -function basic(self) + +function status(self) +end +function config(self) local ctl = {} local opts = self.model.readopts() - ctl.pidlist = self.priv.is_enabled() +-- ctl.pidlist = self.priv.is_enabled() if pidlist then - ctl.enabled = "checked=yes" - ctl.disabled = "" + ctl.status = "enabled" else - ctl.enabled = "" - ctl.disabled = "checked=yes" + ctl.status = "Disabled" end ctl.opts = opts if opts and opts.remote then @@ -33,7 +34,8 @@ function basic(self) ctl.remote = "" ctl.host = "" end - ctl.debug="opts="..tostring(opts) - return ctl end +function expert(self) +end + diff --git a/syslog-expert-html.lsp b/syslog-expert-html.lsp new file mode 100644 index 0000000..fb43eae --- /dev/null +++ b/syslog-expert-html.lsp @@ -0,0 +1,12 @@ + +

System logging

+

Status

+

WORK IN PROGRESS!!!

+ + diff --git a/syslog-model.lua b/syslog-model.lua index 7391cfe..af41c70 100644 --- a/syslog-model.lua +++ b/syslog-model.lua @@ -1,9 +1,10 @@ module(..., package.seeall) -require("pidof") +--require("pidof") require("split") -- we actually need root permissions to get the process list +--[[ priv = {} function priv.is_enabled() return (pidof.pidof("syslogd")) @@ -21,7 +22,7 @@ function priv.enable(opts) end os.system("/etc/init.d/syslogd restart; rc_add -k -s 20 syslog") end - +--]] -- this func does not need privileges function readopts() diff --git a/syslog-status-html.lsp b/syslog-status-html.lsp new file mode 100644 index 0000000..32cb67e --- /dev/null +++ b/syslog-status-html.lsp @@ -0,0 +1,25 @@ + + +

System logging

+ +

SYSTEM INFO

+ +
Program version
+
(Don't think this can be displayed)
+ +
Process status
+
[running|stopped]
+ +
Logfile
+
[/var/log/messages] (Hidden if -R and not -L)
+ +
Remote logging to
+
[1.2.3.4:514] (Hidden if not appliable)
+ + + diff --git a/syslog.menu b/syslog.menu index d80f820..bb5e4f6 100644 --- a/syslog.menu +++ b/syslog.menu @@ -1,2 +1,2 @@ #CAT GROUP/DESC TAB ACTION -System 22System_Logging basic basic +System 22System_Logging status status -- cgit v1.2.3