From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id qLJaDj0+vWPtIwAAbAwnHQ (envelope-from ) for ; Tue, 10 Jan 2023 11:30:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id QEdMDj0+vWPWowAAauVa8A (envelope-from ) for ; Tue, 10 Jan 2023 11:30:21 +0100 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 E6D9B3F7CF for ; Tue, 10 Jan 2023 11:30:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFBby-0008EW-H6; Tue, 10 Jan 2023 05:12:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFBbv-0008Db-LD for guix-patches@gnu.org; Tue, 10 Jan 2023 05:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFBbu-00014g-KT for guix-patches@gnu.org; Tue, 10 Jan 2023 05:12:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFBbu-0005zG-3K for guix-patches@gnu.org; Tue, 10 Jan 2023 05:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60707] [PATCH] gnu: services: Fix fail2ban configuration serialization. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Jan 2023 10:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60707@debbugs.gnu.org Cc: maxim.cournoyer@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167334550522987 (code B ref -1); Tue, 10 Jan 2023 10:12:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jan 2023 10:11:45 +0000 Received: from localhost ([127.0.0.1]:38855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFBbd-0005yg-Ej for submit@debbugs.gnu.org; Tue, 10 Jan 2023 05:11:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:34514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFBbc-0005yY-5E for submit@debbugs.gnu.org; Tue, 10 Jan 2023 05:11:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFBbb-00086v-Vf for guix-patches@gnu.org; Tue, 10 Jan 2023 05:11:44 -0500 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157] helo=nomad-cl1.muradm.net) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFBba-0000xC-Gj for guix-patches@gnu.org; Tue, 10 Jan 2023 05:11:43 -0500 Received: from localhost ([127.0.0.1]:45776) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pFBa0-0006xy-33; Tue, 10 Jan 2023 10:10:04 +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: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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=7/sD3HpxavYLJn3A9L7MIBmsBXgiY92XrMyhEv+3O+o=; b=ldqpS/wiBWQEta/FOuQbtD+IRG IRPTWTFPe06fTTVXkK2XRDnIo/4VvvB9IDxorF/+pAbjs0Re9HFUcEGUP2ZZ29GMs5ghK5aJ5fz+K ZrjxCl08XsHV1rjPR8kgPIrOy6arp1yw5NMHKPG9rLSkWAVQgbLiEqzdwkf92++Ki+cnCQQn1DwYC zaZM1GNQOvA+S83YXKhCqzxb3CjYXf322CyZ5na6X7cDBeXPfuzdVltCP78usz7N7JlMAq4iME4Ar SIXUiZqbKmsSVP4y1k8QB1mKkI7RkNcg3aiClZ7GWkKkPc9D1ZWR5U96XCEuVkl2oW8WSKDlOmfNC s2YTm/ykkhOOI50WulyagOi9tzIEfNOUbJEvMxhQaebGZo41gGrq1EkLowq4qw1OClDiVffgyHXss QgGhgdrxqvuifP9TLcw+R4fl8UNqCsYqE+B7OBGRmV4NhIuiNTPsc8Zq7TLfXfd+zMEJ0TmKjomqe 2CS+ngba13ibabNTPkMeQvK5; Received: from muradm by localhost with local (Exim 4.96) (envelope-from ) id 1pFBbU-0006oD-15; Tue, 10 Jan 2023 13:11:36 +0300 From: muradm Date: Tue, 10 Jan 2023 13:11:36 +0300 Message-Id: <20230110101136.26169-1-mail@muradm.net> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=139.162.159.157; envelope-from=mail@muradm.net; helo=nomad-cl1.muradm.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673346620; a=rsa-sha256; cv=none; b=mv74Fj42aelntnk7EaMr4lYQHMKtN1LP3jUsy50jBNNuCw+gbYE6vYzml7w2imBwdGgDaQ De9hYISFwoHFyvlgroTneVh3v4l3bCWFKk4npUxgaxvbF/JClzUFj2hQ6Y5LprYR9NnaM9 ZCKAsKY/k57MSd4GPFNKc7IG9uDsl96OviuCFVE/Vfylke6om9GzJwVPIVoPjSwQfYm9+U 6eYurh3ouCsgI62PGfz0llVKkxa2QJdGOqEdxlutC60aUi1pCnirW/rJcb3JHAarAQEosU q+4YvMAOWaFVM7Zw84hTK2ACVUVoixzN0N7ErbPckMxxbDVzlKOjtTeJFHhtIQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm.net header.s=mail header.b="ldqpS/wi"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673346620; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=7/sD3HpxavYLJn3A9L7MIBmsBXgiY92XrMyhEv+3O+o=; b=Wj7Y9h9lvXSmpRP3/mao2y26LkgLPEi2azHxGnwbCHcKJqlzPfvLitXw56+bTJFFqEQ1I5 KZcp05vAeiXF8ZV4Um9ItG6gD62VJcsZDg5PCNyA8DHfF1qfNNzTcapKIfPX/cRxY8y3AT F6ayddaf4yeCMnaoQykM8p2he0pPFULMDSzhDqHf/uXtbf3UCjZigoRY/UGEoA2+/kKC4t Fs41b3X6200RCiAERN4AHeMfWWFuNni1hBiNkUcF5Hng8Xd8VeoEzLYfHLFMxRQLahH0X6 GKpBqo2nuCpiL4/4oMGX4odzYgV9zJOmv/GYmDubMI1KLli1Mm1GvwV0Xnoxww== X-Migadu-Spam-Score: -0.78 X-Spam-Score: -0.78 X-Migadu-Queue-Id: E6D9B3F7CF X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm.net header.s=mail header.b="ldqpS/wi"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-TUID: COZ/WlTSnh2J This fixes a regression from 543d971ed2a1d9eb934af1f51930741d7cc4e7ef whereby match-lambda due to configuration field reordering. * gnu/services/security.scm: [serialize-fail2ban-ignore-cache-configuration]: Remove first _ field. [serialize-fail2ban-jail-filter-configuration]: Remove first _ field. [serialize-fail2ban-jail-action-configuration]: Remove first _ field. --- gnu/services/security.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/services/security.scm b/gnu/services/security.scm index 50111455fb..53b3914a4f 100644 --- a/gnu/services/security.scm +++ b/gnu/services/security.scm @@ -44,7 +44,7 @@ (define-configuration/no-serialization fail2ban-ignore-cache-configuration (define serialize-fail2ban-ignore-cache-configuration (match-lambda - (($ _ key max-count max-time) + (($ key max-count max-time) (format #f "key=\"~a\", max-count=~d, max-time=~d" key max-count max-time)))) @@ -56,7 +56,7 @@ (define-configuration/no-serialization fail2ban-jail-filter-configuration (define serialize-fail2ban-jail-filter-configuration (match-lambda - (($ _ name mode) + (($ name mode) (format #f "~a~@[[mode=~a]~]" name (maybe-value mode))))) (define (argument? a) @@ -88,7 +88,7 @@ (define (serialize-fail2ban-jail-action-configuration-arguments args) (define serialize-fail2ban-jail-action-configuration (match-lambda - (($ _ name arguments) + (($ name arguments) (format #f "~a~a" name -- 2.38.1