a/s6-services
1
0
Fork 0
mirror of https://codeberg.org/andyscott/s6-scripts.git synced 2024-09-16 09:38:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Change tomoyo to oneshot, tomoyo-auditd cannot run in foreground

Browse source
This commit is contained in:
Andrew Scott 2023-04-16 00:14:05 -04:00
parent bec72c74e3
commit b776ef59c4
Signed by: a
GPG key ID: 7CD5A5977E4931C1
10 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tomoyo-tools/tomoyo-auditd-log/consumer-for
View file

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

1
tomoyo-tools/tomoyo-auditd-log/notification-fd
View file

@ -1 +0,0 @@
3

1
tomoyo-tools/tomoyo-auditd-log/pipeline-name
View file

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

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

@ -1,9 +0,0 @@
#!/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-tools/tomoyo-auditd-log/type
View file

@ -1 +0,0 @@
longrun

1
tomoyo-tools/tomoyo-auditd-srv/producer-for
View file

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

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

@ -1 +0,0 @@
longrun

10
tomoyo-tools/tomoyo-auditd.conf
View file

@ -1,7 +1,5 @@
# Retrieve logs from a remote system (e.g. REMOTE="remote_ip:remote_port")
# Additonal options must still be configured in /etc/tomoyo/tools/auditd.conf
# See TOMOYO-AUDITD(8)
# 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=""
# This configures the directives used for s6-log in the log service.
DIRECTIVES="n3 s2000000 T"

1
tomoyo-tools/type Normal file
View file

@ -0,0 +1 @@
oneshot

3
tomoyo-tools/tomoyo-auditd-srv/run → tomoyo-tools/up
View file

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