From: fesoj000 <fesoj000@gmail.com>
To: 54309@debbugs.gnu.org
Subject: [bug#54309] [PATCH] services: auditd: use exclusive log directory for auditd
Date: Thu, 10 Mar 2022 17:29:28 +0100 [thread overview]
Message-ID: <8b52d7e5-314d-406e-87b7-cdc087dc7826@gmail.com> (raw)
In-Reply-To: <cc3ad4b4-fd8b-f3c5-31c4-e27a52c694c4@gmail.com>
Use /var/log/audit for auditd. This is the upstream default.
Further, rework the config file generated by auditd-service-type. Only
write values which diverge from the upstream default.
* gnu/services/auditd.scm: add auditd-activation function and extend
activation-service-type.
---
gnu/services/auditd.scm | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/gnu/services/auditd.scm b/gnu/services/auditd.scm
index abde811f51..1eb0ed291b 100644
--- a/gnu/services/auditd.scm
+++ b/gnu/services/auditd.scm
@@ -31,10 +31,10 @@ (define-module (gnu services auditd)
%default-auditd-configuration-directory))
(define auditd.conf
- (plain-file "auditd.conf" "log_file = /var/log/audit.log\nlog_format = \
-ENRICHED\nfreq = 1\nspace_left = 5%\nspace_left_action = \
-syslog\nadmin_space_left_action = ignore\ndisk_full_action = \
-ignore\ndisk_error_action = syslog\n"))
+ (plain-file "auditd.conf" "\
+space_left = 5%
+space_left_action = syslog
+"))
(define %default-auditd-configuration-directory
(computed-file "auditd"
@@ -50,6 +50,14 @@ (define-record-type* <auditd-configuration>
(default audit))
(configuration-directory auditd-configuration-configuration-directory)) ; file-like
+(define (auditd-activation config)
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+ (let ((var-log-audit "/var/log/audit"))
+ (mkdir-p var-log-audit)
+ (chmod var-log-audit #o700)))))
+
(define (auditd-shepherd-service config)
(let* ((audit (auditd-configuration-audit config))
(configuration-directory (auditd-configuration-configuration-directory config)))
@@ -67,7 +75,9 @@ (define auditd-service-type
(extensions
(list
(service-extension shepherd-root-service-type
- auditd-shepherd-service)))
+ auditd-shepherd-service)
+ (service-extension activation-service-type
+ auditd-activation)))
(default-value
(auditd-configuration
(configuration-directory %default-auditd-configuration-directory)))))
--
2.34.0
next prev parent reply other threads:[~2022-03-10 16:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 19:21 [bug#54309] [PATCH] services: auditd: use exclusive log directory for auditd fesoj000
2022-03-09 19:36 ` Maxime Devos
2022-03-09 20:44 ` fesoj000
2022-03-09 21:00 ` fesoj000
2022-03-10 7:12 ` Liliana Marie Prikler
2022-03-10 10:36 ` fesoj000
2022-03-10 16:29 ` fesoj000 [this message]
2022-03-18 19:17 ` [bug#54309] What is the process from here? fesoj000
2022-03-18 20:06 ` Liliana Marie Prikler
2022-03-18 21:48 ` fesoj000
2022-03-18 22:36 ` Liliana Marie Prikler
2022-03-19 11:10 ` fesoj000
2022-03-19 23:09 ` Maxime Devos
2022-03-22 16:50 ` fesoj000
2022-03-22 20:06 ` Liliana Marie Prikler
2022-03-19 11:34 ` [bug#54309] [PATCH] services: auditd: use exclusive log directory for auditd fesoj000
2022-03-19 23:13 ` Maxime Devos
2022-03-20 20:22 ` fesoj000
2022-03-20 20:30 ` Maxime Devos
2022-03-20 20:35 ` Maxime Devos
2022-03-23 20:22 ` [bug#54309] [PATCHv2] " fesoj000
2022-03-23 20:39 ` [bug#54309] [PATCHv3] " fesoj000
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8b52d7e5-314d-406e-87b7-cdc087dc7826@gmail.com \
--to=fesoj000@gmail.com \
--cc=54309@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.