From 1473905fd7b31abafb54929fbd3c84e53cdc7841 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sat, 28 Feb 2015 21:41:29 +0000 Subject: 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 --- examples/ROOT/img/services-network/dns-cache/log/run | 2 +- examples/ROOT/img/services-network/ntpclient/log/run | 2 +- examples/ROOT/img/services-network/sshd/log/run | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/ROOT/img/services-network') 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 -- cgit v1.2.3