From patchwork Mon Aug 29 13:51:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 42067 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 5C4DB27BBE9; Mon, 29 Aug 2022 14:52:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9814A27BBEA for ; Mon, 29 Aug 2022 14:52:19 +0100 (BST) Received: from localhost ([::1]:36224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oSfBa-00042C-KO for patchwork@mira.cbaines.net; Mon, 29 Aug 2022 09:52:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSfBL-00041N-4y for guix-patches@gnu.org; Mon, 29 Aug 2022 09:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42478) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oSfBK-0003O9-Su for guix-patches@gnu.org; Mon, 29 Aug 2022 09:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oSfBK-0000jX-PZ for guix-patches@gnu.org; Mon, 29 Aug 2022 09:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57473] [PATCH v2 3/4] gnu: fail2ban-service-type: Fix type of enabled? field. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Aug 2022 13:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57473@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 57473-submit@debbugs.gnu.org id=B57473.16617810962723 (code B ref 57473); Mon, 29 Aug 2022 13:52:02 +0000 Received: (at 57473) by debbugs.gnu.org; 29 Aug 2022 13:51:36 +0000 Received: from localhost ([127.0.0.1]:60456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSfAu-0000hk-8f for submit@debbugs.gnu.org; Mon, 29 Aug 2022 09:51:36 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:32896 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSfAs-0000gv-UY for 57473@debbugs.gnu.org; Mon, 29 Aug 2022 09:51:35 -0400 Received: from localhost ([127.0.0.1]:46980) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1oSfAn-0000ql-0e; Mon, 29 Aug 2022 13:51:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3dQvcefXho32znbVxrR/P2RU0gIthPLKFqkefCHd/Hs=; b=ktT8R5l8RvuxKMahTblgotr5Uq b5UdI/uu5iU8CwrVGqxjx1FBL0OaFBX2DnE52m7epW3mQGVZMOIaVN3kGzmbnsRc2GS1+t3lPzsh0 ngW2MIvV86QEY2qmpJPf/TBIs19imXtDzvRX2C/vtkiO95FfO4DWVZOh64d7ek9XcbMEMiuhNSm+g CMvXKatYvm5N9zN9op2NPsH6Ggbo2rlwwB7/QXKEHHe0My0hSCNrp4GHHpsI+Q6IaORxMZ5WYd2Tj YoVMOqMA7toUhW9gX4sWCq0v0cmHkQQTqtilamyt1idK8SpkjvQmNwXeetRvOxIxpd8KIW3uiy+HD yJlKLUz41YrTpZ3Qnuz2KLxYwCv9PBJdsMocvEs9hmU12diCEXqt+cFKjHG7UKOTDbGfXzR8EbKqG kLrUzMd4Ys4jvVUMQCJjc+BDBG5rxtdC3IeoVRK8qW8b4nyJf9Sl20/+Px/Z42MTGzv0TlvRMQhL5 jhDdx3RjHS9eAoBeyRfku71H; Received: from muradm by localhost with local (Exim 4.96) (envelope-from ) id 1oSfAn-00065Z-0C; Mon, 29 Aug 2022 16:51:29 +0300 From: muradm Date: Mon, 29 Aug 2022 16:51:20 +0300 Message-Id: <20220829135121.23392-3-mail@muradm.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220829135121.23392-1-mail@muradm.net> References: <20220829094205.15595-1-mail@muradm.net> <20220829135121.23392-1-mail@muradm.net> 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 * gnu/services/security.scm (fail2ban-jail-configuration) [enabled?]: Should be maybe-boolean, which is how normaly fail2ban is configured. This also allows sections without enabled field like @samp{[DEFAULT]}. * doc/guix.texi: Type of enabled? is maybe-boolean. --- doc/guix.texi | 2 +- gnu/services/security.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7199ff6bc2..ebfc8fb3fa 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36656,7 +36656,7 @@ Available @code{fail2ban-jail-configuration} fields are: @item @code{name} (type: string) Required name of this jail configuration. -@item @code{enabled?} (default: @code{#t}) (type: boolean) +@item @code{enabled?} (type: maybe-boolean) Whether this jail is enabled. @item @code{backend} (type: maybe-symbol) diff --git a/gnu/services/security.scm b/gnu/services/security.scm index 7f66c462f3..3283a582f2 100644 --- a/gnu/services/security.scm +++ b/gnu/services/security.scm @@ -197,7 +197,7 @@ (define-configuration fail2ban-jail-configuration "Required name of this jail configuration." empty-serializer) (enabled? - (boolean #t) + maybe-boolean "Whether this jail is enabled.") (backend maybe-symbol