- add -s support to s6-svscan

 - change examples to support -s
 - change examples to invoke s6-rc, remove servicedirs

3 files changed, 23 insertions, 0 deletions

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