From patchwork Mon Jul 27 09:31:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 23402 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2CCFC27BBE3; Mon, 27 Jul 2020 10:32:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E914227BBE1 for ; Mon, 27 Jul 2020 10:32:08 +0100 (BST) Received: from localhost ([::1]:43448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzzUO-000068-GZ for patchwork@mira.cbaines.net; Mon, 27 Jul 2020 05:32:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzzUI-00005s-F5 for guix-patches@gnu.org; Mon, 27 Jul 2020 05:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jzzUI-0004Fu-4D for guix-patches@gnu.org; Mon, 27 Jul 2020 05:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jzzUH-0006Ng-V0 for guix-patches@gnu.org; Mon, 27 Jul 2020 05:32:01 -0400 Subject: bug#42427: [PATCH] services: Fix auditd startup. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 27 Jul 2020 09:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 42427 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Robin Green Cc: 42427-done@debbugs.gnu.org Mail-Followup-To: 42427@debbugs.gnu.org, ludo@gnu.org, greenrd@greenrd.org Received: via spool by 42427-done@debbugs.gnu.org id=D42427.159584230924504 (code D ref 42427); Mon, 27 Jul 2020 09:32:01 +0000 Received: (at 42427-done) by debbugs.gnu.org; 27 Jul 2020 09:31:49 +0000 Received: from localhost ([127.0.0.1]:54026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzzU4-0006N9-RG for submit@debbugs.gnu.org; Mon, 27 Jul 2020 05:31:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzzU2-0006Mx-N7 for 42427-done@debbugs.gnu.org; Mon, 27 Jul 2020 05:31:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52869) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzzTv-0004Dy-Ia; Mon, 27 Jul 2020 05:31:40 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=38852 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jzzTv-0008RT-6M; Mon, 27 Jul 2020 05:31:39 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20200719171731.7453-1-greenrd@greenrd.org> <87k0yqxmta.fsf@greenrd.org> Date: Mon, 27 Jul 2020 11:31:37 +0200 In-Reply-To: <87k0yqxmta.fsf@greenrd.org> (Robin Green's message of "Sun, 26 Jul 2020 17:28:49 +0100") Message-ID: <87365d1eyu.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, Robin Green skribis: >>From 2944613bee5a742b04c26a7c27d3a09f9047dbe5 Mon Sep 17 00:00:00 2001 > From: Robin Green > Date: Sun, 19 Jul 2020 08:32:31 +0100 > Subject: [PATCH] services: Fix auditd startup. > > * gnu/services/auditd.scm: Make auditd start successfully in the default case. > * gnu/services/aux-files/auditd/auditd.conf: New file. > * doc/guix.texi (Miscellaneous Services): Update docs to reflect changes. > --- > doc/guix.texi | 11 +++++++++-- > gnu/services/auditd.scm | 41 ++++++++++++++++++++++++++++++----------- > 2 files changed, 39 insertions(+), 13 deletions(-) Applied with the changes below and a tweaked commit log. Thank you! Ludo’. diff --git a/doc/guix.texi b/doc/guix.texi index 8b9eb791c7..d4557b360a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -27629,8 +27629,8 @@ This is the data type representing the configuration of auditd. @item @code{audit} (default: @code{audit}) The audit package to use. -@item @code{configdir} (default: @code{(local-file "aux-files/auditd")}) -A directory containing a configuration file for the audit package, which +@item @code{configuration-directory} (default: @code{%default-auditd-configuration-directory}) +The directory containing the configuration file for the audit package, which must be named @code{auditd.conf}, and optionally some audit rules to instantiate on startup. diff --git a/gnu/services/auditd.scm b/gnu/services/auditd.scm index 1750614207..cffc226ec9 100644 --- a/gnu/services/auditd.scm +++ b/gnu/services/auditd.scm @@ -48,7 +48,7 @@ ignore\ndisk_error_action = syslog\n")) auditd-configuration? (audit auditd-configuration-audit ; package (default audit)) - (configuration-directory auditd-configuration-configuration-directory)) ; local-file + (configuration-directory auditd-configuration-configuration-directory)) ; file-like (define (auditd-shepherd-service config) (let* ((audit (auditd-configuration-audit config))