summaryrefslogtreecommitdiff
path: root/examples/ROOT
diff options
context:
space:
mode:
authorColin Booth <colin@heliocat.net>2015-02-28 21:41:29 +0000
committerColin Booth <colin@heliocat.net>2015-02-28 23:40:18 +0000
commit1473905fd7b31abafb54929fbd3c84e53cdc7841 (patch)
tree75d4a40f74ce38c01ce23629912af94dfbeebdac /examples/ROOT
parentda16a33f6c6ec0a33e85b13b7ffce000f1eb8267 (diff)
downloads6-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')
-rwxr-xr-xexamples/ROOT/img/services-local/klogd-linux/log/run2
-rw-r--r--examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE7
-rwxr-xr-xexamples/ROOT/img/services-local/syslogd-linux/log/run6
-rwxr-xr-xexamples/ROOT/img/services-network/dns-cache/log/run2
-rwxr-xr-xexamples/ROOT/img/services-network/ntpclient/log/run2
-rwxr-xr-xexamples/ROOT/img/services-network/sshd/log/run2
-rwxr-xr-xexamples/ROOT/img/tmpfs/service/s6-svscan-log/run2
7 files changed, 16 insertions, 7 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
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
diff --git a/examples/ROOT/img/tmpfs/service/s6-svscan-log/run b/examples/ROOT/img/tmpfs/service/s6-svscan-log/run
index a55a822..7536e1f 100755
--- a/examples/ROOT/img/tmpfs/service/s6-svscan-log/run
+++ b/examples/ROOT/img/tmpfs/service/s6-svscan-log/run
@@ -3,7 +3,7 @@ redirfd -w 2 /dev/console
redirfd -rnb 0 fifo
s6-setuidgid nobody
exec -c
-s6-log -bpt /tmp/uncaught-logs
+s6-log -bp t /tmp/uncaught-logs
# The -p option is important:
# even if s6-svscan is told to kill everything,