summaryrefslogtreecommitdiff
path: root/examples/ROOT/img
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-03-03 23:29:22 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-03-03 23:29:22 +0000
commitbcb2bb4b6ee85f19c80472df9b44eff0c4016e7b (patch)
tree55f0c27f82b3a13e5f4f76f3a8f09796239e5769 /examples/ROOT/img
parent3c933c332b037f427c123f2cf958b717c5f1605a (diff)
downloads6-bcb2bb4b6ee85f19c80472df9b44eff0c4016e7b.tar.xz
- fix the LOGSCRIPT in examples/.../syslogd-linux/log
- fix comments in a few examples/.../README - add a /var symlink in examples/ROOT
Diffstat (limited to 'examples/ROOT/img')
-rw-r--r--examples/ROOT/img/services-local/syslogd-linux/log/README13
-rw-r--r--examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT10
2 files changed, 14 insertions, 9 deletions
diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/README b/examples/ROOT/img/services-local/syslogd-linux/log/README
index de384ce..9d4968e 100644
--- a/examples/ROOT/img/services-local/syslogd-linux/log/README
+++ b/examples/ROOT/img/services-local/syslogd-linux/log/README
@@ -1,4 +1,9 @@
-This logger service logs everything the syslogd service receives
-into the /var/log/syslogd/ logdir.
-You may want to edit the logging script to provide filters to
-change s6-log's behaviour.
+ This logger service logs everything the syslogd service receives
+into subdirectories of /var/log/syslogd/ logdir.
+
+ The script provided in env/LOGSCRIPT emulates the default
+syslogd behaviour on a majority of Linux distributions.
+
+ Note that spaces cannot be used as is in the LOGSCRIPT file,
+because they are delimiters for the splitting of $LOGSCRIPT
+in the run script. So \s is used instead.
diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT
index 65c53e6..e7a1eb7 100644
--- a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT
+++ b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT
@@ -1,6 +1,6 @@
-- +^error\. t /var/log/syslogd/error
-- +^authpriv\. t /var/log/syslogd/auth
-- +^user\. t /var/log/syslogd/user
-- +^messages\. t /var/log/syslogd/messages
-- +^daemon\. t /var/log/syslogd/daemon
+- +^[0-9]+:\s[0-9]+:\serror\. t /var/log/syslogd/error
+- +^[0-9]+:\s[0-9]+:\sauthpriv\. t /var/log/syslogd/auth
+- +^[0-9]+:\s[0-9]+:\suser\. t /var/log/syslogd/user
+- +^[0-9]+:\s[0-9]+:\smessages\. t /var/log/syslogd/messages
+- +^[0-9]+:\s[0-9]+:\sdaemon\. t /var/log/syslogd/daemon
f t /var/log/syslogd/misc