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-network | |
| 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-network')
| -rwxr-xr-x | examples/ROOT/img/services-network/dns-cache/log/run | 2 | ||||
| -rwxr-xr-x | examples/ROOT/img/services-network/ntpclient/log/run | 2 | ||||
| -rwxr-xr-x | examples/ROOT/img/services-network/sshd/log/run | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/ROOT/img/services-network/dns-cache/log/run b/examples/ROOT/img/services-network/dns-cache/log/run index 7bd42bd..4177eaa 100755 --- a/examples/ROOT/img/services-network/dns-cache/log/run +++ b/examples/ROOT/img/services-network/dns-cache/log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid dnslog exec -c -s6-log -t s1000000 n20 /var/log/dns-cache +s6-log t s1000000 n20 /var/log/dns-cache diff --git a/examples/ROOT/img/services-network/ntpclient/log/run b/examples/ROOT/img/services-network/ntpclient/log/run index 261b534..80d7b5b 100755 --- a/examples/ROOT/img/services-network/ntpclient/log/run +++ b/examples/ROOT/img/services-network/ntpclient/log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid ntplog exec -c -s6-log -t /var/log/ntpclient +s6-log t /var/log/ntpclient diff --git a/examples/ROOT/img/services-network/sshd/log/run b/examples/ROOT/img/services-network/sshd/log/run index 9795581..d07f180 100755 --- a/examples/ROOT/img/services-network/sshd/log/run +++ b/examples/ROOT/img/services-network/sshd/log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid log exec -c -s6-log -t s1000000 n20 /var/log/sshd +s6-log t s1000000 n20 /var/log/sshd |