Skip to content

auditd.service: set LogsDirectory and RuntimeDirectory, remove tmpfiles dependency #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

auditd.service: set LogsDirectory and RuntimeDirectory, remove tmpfiles dependency #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
558dbdf
auditd.service: set LogsDirectory and RuntimeDirectory
LordGrimmauld Sep 11, 2025
0705ca9
auditd: remove tmpfiles dependency
LordGrimmauld Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion audit.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ fi
%attr(755,root,root) %{_bindir}/aulast
%attr(755,root,root) %{_bindir}/aulastlog
%attr(755,root,root) %{_bindir}/ausyscall
%attr(640,root,root) %{_tmpfilesdir}/audit.conf
%attr(644,root,root) %{_unitdir}/auditd.service
%attr(750,root,root) %dir %{_libexecdir}/initscripts/legacy-actions/auditd
%attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/condrestart
Expand Down
4 changes: 0 additions & 4 deletions init.d/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
CONFIG_CLEAN_FILES = *.rej *.orig
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = auditd.service.in audit-rules.service.in auditd.conf auditd.cron \
audit-tmpfiles.conf \
libaudit.conf auditd.condrestart \
auditd.reload auditd.restart auditd.resume \
auditd.rotate auditd.state auditd.stop audit-rules.service \
Expand All @@ -48,8 +47,6 @@ BUILT_SOURCES = auditd.service audit-rules.service

install-data-hook:
$(INSTALL_DATA) -D -m 640 ${srcdir}/${libconfig} ${DESTDIR}${sysconfdir}
mkdir -p ${DESTDIR}$(prefix)/lib/tmpfiles.d/
$(INSTALL_DATA) -m 640 ${srcdir}/audit-tmpfiles.conf ${DESTDIR}$(prefix)/lib/tmpfiles.d/audit.conf

install-exec-hook:
mkdir -p ${DESTDIR}${initdir}
Expand Down Expand Up @@ -81,5 +78,4 @@ uninstall-hook:
rm ${DESTDIR}${legacydir}/stop
rm ${DESTDIR}${legacydir}/restart
rm ${DESTDIR}${legacydir}/condrestart
rm ${DESTDIR}$(prefix)/lib/tmpfiles.d/audit.conf
rm ${DESTDIR}${sysconfdir}/bash_completion.d/audit.bash_completion
2 changes: 1 addition & 1 deletion init.d/audit-rules.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ConditionKernelCommandLine=!audit=off
DefaultDependencies=no
# We need the local file system for the rules. Augenrules uses /tmp while
# constructing rules, so we have to wait for that to be available, too.
After=local-fs.target systemd-tmpfiles-setup.service
After=local-fs.target

Documentation=man:auditctl(8) https://github.com/linux-audit/audit-documentation

Expand Down
1 change: 0 additions & 1 deletion init.d/audit-tmpfiles.conf
View file
Open in desktop

This file was deleted.

9 changes: 7 additions & 2 deletions init.d/auditd.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Wants=audit-rules.service
## If using remote logging, ensure that the systemd-update-utmp.service file
## is updated to remove the After=auditd.service directive to prevent a
## boot-time ordering cycle.
After=local-fs.target systemd-tmpfiles-setup.service
#After=network-online.target local-fs.target systemd-tmpfiles-setup.service
After=local-fs.target
#After=network-online.target local-fs.target
Before=sysinit.target shutdown.target audit-rules.service
#Before=shutdown.target
Conflicts=shutdown.target
Expand All @@ -35,6 +35,11 @@ ExecStart=@sbindir@/auditd
Restart=on-failure
## Do not restart for intentional exits. See EXIT CODES section in auditd(8).
RestartPreventExitStatus=2 4 6
## Create Log and Runtime directory
LogsDirectory=audit
LogsDirectoryMode=0700
RuntimeDirectory=audit
RuntimeDirectoryMode=0755

### Security Settings ###
MemoryDenyWriteExecute=true
Expand Down