Compare commits

..

No commits in common. "845d4900974207fc001b5e727ef2183aae1c859e" and "9e69bf6d9aa43f5ed0ea62ed2ec07725440e2717" have entirely different histories.

36 changed files with 34 additions and 32 deletions

View file

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

1
config/klogd.conf Normal file
View file

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

View file

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

View file

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

View file

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

View file

6
klogd-srv/run Normal file
View file

@ -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

View file

@ -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)

View file

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

View file

@ -3,7 +3,7 @@ envfile /etc/s6/config/smartd.conf
importas -sCuD "s2000000 n3 T" DIRECTIVES DIRECTIVES importas -sCuD "s2000000 n3 T" DIRECTIVES DIRECTIVES
ifelse { test -w /var/log } { ifelse { test -w /var/log } {
foreground { install -d -o s6log -g s6log /var/log/smartd } 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 } 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

3
smartd-srv/run Normal file
View file

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

View file

@ -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}

View file

@ -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"

View file

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

View file

@ -0,0 +1 @@
3

View file

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

9
tomoyo-auditd-log/run Normal file
View file

@ -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

1
tomoyo-auditd-log/type Normal file
View file

@ -0,0 +1 @@
longrun

View file

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

3
tomoyo-auditd-srv/run Normal file
View file

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

1
tomoyo-auditd-srv/type Normal file
View file

@ -0,0 +1 @@
longrun

View file

@ -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=""

View file

@ -1 +0,0 @@
oneshot

View file

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