From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id AN0xCta4GF/cUAAA0tVLHw (envelope-from ) for ; Wed, 22 Jul 2020 22:08:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id II/mBda4GF9hFAAAbx9fmQ (envelope-from ) for ; Wed, 22 Jul 2020 22:08:22 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A795894005D for ; Wed, 22 Jul 2020 22:08:21 +0000 (UTC) Received: from localhost ([::1]:55922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyMuR-00066l-Sv for larch@yhetil.org; Wed, 22 Jul 2020 18:08:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyMuB-000666-4a for guix-patches@gnu.org; Wed, 22 Jul 2020 18:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jyMu9-0002Lc-TS for guix-patches@gnu.org; Wed, 22 Jul 2020 18:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jyMu9-0007M1-Nq for guix-patches@gnu.org; Wed, 22 Jul 2020 18:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42427] [PATCH] services: Fix auditd startup. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jul 2020 22:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42427 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Robin Green Cc: 42427@debbugs.gnu.org Received: via spool by 42427-submit@debbugs.gnu.org id=B42427.159545566028241 (code B ref 42427); Wed, 22 Jul 2020 22:08:01 +0000 Received: (at 42427) by debbugs.gnu.org; 22 Jul 2020 22:07:40 +0000 Received: from localhost ([127.0.0.1]:43305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyMtn-0007LR-W2 for submit@debbugs.gnu.org; Wed, 22 Jul 2020 18:07:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyMtm-0007LF-JZ for 42427@debbugs.gnu.org; Wed, 22 Jul 2020 18:07:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57004) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyMte-0002Iu-W1; Wed, 22 Jul 2020 18:07:32 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57886 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jyMte-0007pS-H1; Wed, 22 Jul 2020 18:07:30 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200719171731.7453-1-greenrd@greenrd.org> Date: Thu, 23 Jul 2020 00:07:28 +0200 In-Reply-To: <20200719171731.7453-1-greenrd@greenrd.org> (Robin Green's message of "Sun, 19 Jul 2020 18:17:31 +0100") Message-ID: <87zh7rfbkv.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: yxBahxPbk0xD Hello Robin, Robin Green skribis: > * 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. Nice, it=E2=80=99s a good idea. Some comments below: > -(define-configuration auditd-configuration > - (audit > - (package audit) > - "Audit package.")) > +(define-record-type* I think we should keep using =E2=80=98define-configuration=E2=80=99, unless= there=E2=80=99s a good reason to change. WDYT? > + auditd-configuration make-auditd-configuration > + auditd-configuration? > + (audit auditd-configuration-audit ; package > + (default audit)) > + (configdir auditd-configuration-configdir)) ; local-file s/configdir/configuration-directory/, to be consistent with the rest of the code. You can also set its default value. > + (auditd-configuration > + (configdir (local-file "aux-files/auditd" #:recursive= ? #t)))))) > diff --git a/gnu/services/aux-files/auditd/auditd.conf b/gnu/services/aux= -files/auditd/auditd.conf > new file mode 100644 > index 0000000000..6e7555cf4c > --- /dev/null > +++ b/gnu/services/aux-files/auditd/auditd.conf Since it=E2=80=99s a small file, I have a slight preference for using =E2=80=98plain-file=E2=80=99 + =E2=80=98computed-file=E2=80=99: (define auditd.conf (plain-file =E2=80=A6)) (define %default-auditd-configuration-directory ;make it public (computed-file "auditd" #~(begin (mkdir #$output) (copy-file #$auditd.conf (string-append #$output "/auditd.conf")))= )) WDYT? Thanks, Ludo=E2=80=99.