From 4da6b9c320e6b49d38af5cb6b5861480141f24cd Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 6 Oct 2015 16:23:19 +0000 Subject: - add -s support to s6-svscan - change examples to support -s - change examples to invoke s6-rc, remove servicedirs --- examples/syslogd-linux/log/README | 9 +++++++++ examples/syslogd-linux/log/env/LOGSCRIPT | 6 ++++++ examples/syslogd-linux/log/run | 8 ++++++++ 3 files changed, 23 insertions(+) create mode 100644 examples/syslogd-linux/log/README create mode 100644 examples/syslogd-linux/log/env/LOGSCRIPT create mode 100755 examples/syslogd-linux/log/run (limited to 'examples/syslogd-linux/log') diff --git a/examples/syslogd-linux/log/README b/examples/syslogd-linux/log/README new file mode 100644 index 0000000..9d4968e --- /dev/null +++ b/examples/syslogd-linux/log/README @@ -0,0 +1,9 @@ + 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/syslogd-linux/log/env/LOGSCRIPT b/examples/syslogd-linux/log/env/LOGSCRIPT new file mode 100644 index 0000000..e7a1eb7 --- /dev/null +++ b/examples/syslogd-linux/log/env/LOGSCRIPT @@ -0,0 +1,6 @@ +- +^[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 diff --git a/examples/syslogd-linux/log/run b/examples/syslogd-linux/log/run new file mode 100755 index 0000000..56de271 --- /dev/null +++ b/examples/syslogd-linux/log/run @@ -0,0 +1,8 @@ +#!/command/execlineb -P +s6-setuidgid syslog +s6-envdir -f env +import -Cs LOGSCRIPT +exec -c +s6-log $LOGSCRIPT + +# Change env/LOGSCRIPT to alter s6-log's behaviour -- cgit v1.2.3