README.md

@@ -1 +0,0 @@
-# s6-scripts

config/klogd.conf

@@ -0,0 +1 @@
+DIRECTIVES="s2000000 n3 t"

config/smartd.conf

@@ -1,2 +1,2 @@
 # This configures the directives used for s6-log in the log service.
-DIRECTIVES="s2000000 n3 t"
+DIRECTIVES="n3 s2000000 T"

config/tomoyo-auditd.conf

@@ -0,0 +1,2 @@
+# This configures the directives used for s6-log in the log service.
+DIRECTIVES="n3 s2000000 T"

klogd-log/run

@@ -1,4 +1,5 @@
 #!/bin/execlineb -P
+# See: https://git.skarnet.org/cgi-bin/cgit.cgi/s6/tree/examples
 envfile /etc/s6/config/klogd.conf
 importas -sCuD "s2000000 n3 t" DIRECTIVES DIRECTIVES
 ifelse { test -w /var/log } {

klogd-srv/run

@@ -0,0 +1,6 @@
+#!/bin/execlineb -P
+# See: https://git.skarnet.org/cgi-bin/cgit.cgi/s6/tree/examples
+fdmove -c 2 1
+redirfd -r 0 /proc/kmsg
+exec -c
+ucspilogd

klogd/README.md

@@ -1,2 +0,0 @@
-Based on the [example](https://git.skarnet.org/cgi-bin/cgit.cgi/s6/tree/examples/klogd-linux) provided by s6,
-Copyright (c) 2011 Laurent Bercot [ISC License](https://git.skarnet.org/cgi-bin/cgit.cgi/s6/tree/COPYING)

klogd/klogd-srv/run

@@ -1,4 +0,0 @@
-#!/bin/execlineb -P
-fdmove -c 2 1
-redirfd -r 0 /proc/kmsg
-exec -c ucspilogd

smartd-log/run

@@ -3,7 +3,7 @@ envfile /etc/s6/config/smartd.conf
 importas -sCuD "s2000000 n3 T" DIRECTIVES DIRECTIVES
 ifelse { test -w /var/log } {
 	foreground { install -d -o s6log -g s6log /var/log/smartd }
-	s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /var/log/smartd
+	exec -c s6-log -d3 -b -- ${DIRECTIVES} /var/log/smartd
 }
 foreground { install -d -o s6log -g s6log /run/log/smartd }
-s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /run/log/smartd
+exec -c s6-log -d3 -b -- ${DIRECTIVES} /run/log/smartd

smartd-srv/run

@@ -0,0 +1,3 @@
+#!/bin/execlineb -P                                                                               
+fdmove -c 2 1                                                                                     
+exec smartd -d

smartmontools/smartd-srv/run

@@ -1,5 +0,0 @@
-#!/bin/execlineb -P
-envfile /etc/s6/config/smartd.conf
-importas -sCuD "" SMARTD_OPTS SMARTD_OPTS
-fdmove -c 2 1
-exec smartd ${SMARTD_OPTS}

smartmontools/smartd.conf

@@ -1,7 +0,0 @@
-# "-d" ("--debug") provides additional output and allows s6-log to handle 
-# logging, change to "-n" ("--no-fork") if you prefer syslog. See SMARTD(8)
-# for additional options.
-SMARTD_OPTS="-d"
-
-# This configures the directives used for s6-log in the log service.
-DIRECTIVES="n3 s2000000 T"

tomoyo-auditd-log/consumer-for

@@ -0,0 +1 @@
+tomoyo-auditd-srv

tomoyo-auditd-log/notification-fd

@@ -0,0 +1 @@
+3

tomoyo-auditd-log/pipeline-name

@@ -0,0 +1 @@
+tomoyo-auditd

tomoyo-auditd-log/run

@@ -0,0 +1,9 @@
+#!/bin/execlineb -P
+envfile /etc/s6/config/tomoyo-auditd.conf
+importas -sCuD "n3 s2000000 T" DIRECTIVES DIRECTIVES
+ifelse { test -w /var/log } {
+	foreground { install -d -o s6log -g s6log /var/log/tomoyo-auditd }
+	s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /var/log/tomoyo-auditd
+}
+foreground { install -d -o s6log -g s6log /run/log/tomoyo-auditd }
+s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /run/log/tomoyo-auditd

tomoyo-auditd-log/type

@@ -0,0 +1 @@
+longrun

tomoyo-auditd-srv/producer-for

@@ -0,0 +1 @@
+tomoyo-auditd-log

tomoyo-auditd-srv/run

@@ -0,0 +1,3 @@
+#!/bin/execlineb -P
+fdmove -c 2 1
+exec tomoyo-auditd 

tomoyo-auditd-srv/type

@@ -0,0 +1 @@
+longrun

tomoyo-tools/tomoyo-auditd.conf

@@ -1,5 +0,0 @@
-# Retrieve logs from a remote system (e.g. REMOTE="remote_ip:remote_port").
-# Note that tomoyo-auditd still requires that we configure audit logs in
-# /etc/tomoyo/tools/auditd.conf, see TOMOYO-AUDITD(8) or
-# https://tomoyo.osdn.jp.
-REMOTE=""

tomoyo-tools/type

@@ -1 +0,0 @@
-oneshot

tomoyo-tools/up

@@ -1,4 +0,0 @@
-#!/bin/execlineb -P
-envfile /etc/s6/config/tomoyo-auditd.conf
-importas -sCuD "" REMOTE REMOTE
-exec tomoyo-auditd ${REMOTE}