diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-10-06 16:23:19 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-10-06 16:23:19 +0000 |
commit | 4da6b9c320e6b49d38af5cb6b5861480141f24cd (patch) | |
tree | c920b72f5f291a29a71ca009ce113e4846b8a217 /examples/ROOT/img/services-local/syslogd-linux | |
parent | 478dd24279f833042a94590df0726d163b576af5 (diff) | |
download | s6-4da6b9c320e6b49d38af5cb6b5861480141f24cd.tar.xz |
- add -s support to s6-svscan
- change examples to support -s
- change examples to invoke s6-rc, remove servicedirs
Diffstat (limited to 'examples/ROOT/img/services-local/syslogd-linux')
6 files changed, 0 insertions, 39 deletions
diff --git a/examples/ROOT/img/services-local/syslogd-linux/README b/examples/ROOT/img/services-local/syslogd-linux/README deleted file mode 100644 index a3c3ba4..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/README +++ /dev/null @@ -1,7 +0,0 @@ -This syslogd emulation works on any Unix where syslog() is -implemented via a connection on the /dev/log Unix-domain socket. -It needs a Unix superserver (see s6-networking, ucspi-unix or -ucspi-ipc) and ucspilogd. -A ucspilogd process is spawned for every syslog() client. It -processes logs and sends them to stderr, i.e. the service's -logger. diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/README b/examples/ROOT/img/services-local/syslogd-linux/log/README deleted file mode 100644 index 9d4968e..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/log/README +++ /dev/null @@ -1,9 +0,0 @@ - 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 deleted file mode 100644 index e7a1eb7..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT +++ /dev/null @@ -1,6 +0,0 @@ -- +^[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/ROOT/img/services-local/syslogd-linux/log/run b/examples/ROOT/img/services-local/syslogd-linux/log/run deleted file mode 100755 index 56de271..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/log/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 diff --git a/examples/ROOT/img/services-local/syslogd-linux/notification-fd b/examples/ROOT/img/services-local/syslogd-linux/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/examples/ROOT/img/services-local/syslogd-linux/run b/examples/ROOT/img/services-local/syslogd-linux/run deleted file mode 100755 index de33c2c..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/command/execlineb -P -fdmove -c 2 1 -exec -c -s6-envuidgid nobody -fdmove 1 3 -s6-ipcserver -U -1 -- /dev/log -fdmove -c 1 2 -ucspilogd IPCREMOTEEUID IPCREMOTEEGID |