diff options
| author | Colin Booth <colin@heliocat.net> | 2015-02-28 21:41:29 +0000 |
|---|---|---|
| committer | Colin Booth <colin@heliocat.net> | 2015-02-28 23:40:18 +0000 |
| commit | 1473905fd7b31abafb54929fbd3c84e53cdc7841 (patch) | |
| tree | 75d4a40f74ce38c01ce23629912af94dfbeebdac /examples/ROOT/img/services-local | |
| parent | da16a33f6c6ec0a33e85b13b7ffce000f1eb8267 (diff) | |
| download | s6-1473905fd7b31abafb54929fbd3c84e53cdc7841.tar.xz | |
Update s6 example files
Change -t to t for s6-log scripts:
With the release of s6 v2.1.1.0 the -t flag to s6-log was depricated and
replaced with a per-match control directive. This updates the example
scripts to follow the current supported logging syntax.
Update syslogd-linux example logger:
It's helpful if you're doing syslog-style logging to split your log
streams into different files in addition to a consolidated log. This
change also splits the logging script out to be easier to manage. This
also serves a second purpose of highlighting the fact that s6-log
supports multiple log targets.
Remove (most) absolute paths for non-init replacement s6-svscan:
With non-slashpackage installs becoming the default, odds are that the
execline and s6 binaries will be installed somewhere in the path. While
all the example scripts still make calls to /command/execlineb, it makes
sense to reduce the amount of editing needed to make these scripts work.
Updating gitignore to skip trying to add vim turds
Diffstat (limited to 'examples/ROOT/img/services-local')
3 files changed, 12 insertions, 3 deletions
diff --git a/examples/ROOT/img/services-local/klogd-linux/log/run b/examples/ROOT/img/services-local/klogd-linux/log/run index 66f2cd5..d9659e7 100755 --- a/examples/ROOT/img/services-local/klogd-linux/log/run +++ b/examples/ROOT/img/services-local/klogd-linux/log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid klog exec -c -s6-log -t s1000000 n20 /var/log/klogd +s6-log t s1000000 n20 /var/log/klogd diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE new file mode 100644 index 0000000..814f95c --- /dev/null +++ b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE @@ -0,0 +1,7 @@ +- +^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 +- 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 index 0d99ba9..3cb4796 100755 --- a/examples/ROOT/img/services-local/syslogd-linux/log/run +++ b/examples/ROOT/img/services-local/syslogd-linux/log/run @@ -1,5 +1,7 @@ #!/command/execlineb -P +s6-envdir -f env +import -Cs LOGLINE s6-setuidgid syslog exec -c -s6-log -t s1000000 n20 /var/log/syslogd -# Change the logging script to alter s6-log's behaviour +s6-log $LOGLINE +# Change env/LOGLINE to alter s6-log's behaviour |