From patchwork Fri Nov 1 12:39:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32780 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 3BC5127BBEA; Fri, 1 Nov 2024 12:44:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 F0C9127BBE2 for ; Fri, 1 Nov 2024 12:44:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qzc-0007hB-VQ; Fri, 01 Nov 2024 08:43:09 -0400 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 1t6qzY-0007f4-HL for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t6qzX-0000R5-Ir; Fri, 01 Nov 2024 08:43:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=wcCHzHdyz0BWPNXX43hy8cmk9uGRWzBRpCs1w8qNZzs=; b=Ua/6jwXLVSOTPJc9UlZWTN0MbsfDW+TwWLDT8XNxaUowYrddfvsWAtxsd/sebaNqF09lma1vtvIbMDuvRk4T25LCOGAkQPqBygX47s10BRTn8N+9DfdJwfw8G8pOyScRs1n6ZT7h8Dfsuj2MEqcS8MuUXPizMTd+9B7n/kamIAc4OrbkVuV595A3OI9//bnXRUjGPBLZOsauT2dfZ3wZMbBMbCkTimf9MGAVMq4MAoMmp4vUwHiBcN8rWPY9iqDqqjP4bVro8I2duV7pAVtw8fw1PunRmj8uICXdj8PePpj79KwpRDapIViD8cTtLu/fq1ZbDDLAvBYcB+y/kjr/jA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qzX-0007vA-2W; Fri, 01 Nov 2024 08:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 1/9] doc: Use @table @code for anonip-configuration doc. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046493630335 (code B ref 74151); Fri, 01 Nov 2024 12:43:02 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:16 +0000 Received: from localhost ([127.0.0.1]:49207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyl-0007tD-KT for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:16 -0400 Received: from mail-pg1-f174.google.com ([209.85.215.174]:47557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyc-0007sl-Dm for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:12 -0400 Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-7eb0bc007edso1141759a12.3 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464865; x=1731069665; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wcCHzHdyz0BWPNXX43hy8cmk9uGRWzBRpCs1w8qNZzs=; b=G8vau80z4PBkCDkJ+h/ElbGNGgkkPWtebzmd65cDxZzvjn0yERTr4QHUErfVz9ZzyA 0OTYbHjUZ3vB88RTIzlVOYIrUq77GGDqvCEJfw7uf4kD6TCzShv/YH/fvc1W7qS3XyJB bXV/x8lUz1065bxiZjsm2trUzNqm/y6G8UG+ooJ1jHGwkwqfjNHLuHu+dGi0EYdoF1db 8ZtENXcJCsaynbs7MOWSbWtqL6x+Ss6eGNlbGPACZgNZbhRAMLE1T5W1RT+hpvM0kecd arAUVJpJqbsD62QbC0OFcy96mzVT/ux8WeqA7eKdUeVu1+gIWKXZRLKpgtPoZblGoKJx rHhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464865; x=1731069665; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wcCHzHdyz0BWPNXX43hy8cmk9uGRWzBRpCs1w8qNZzs=; b=jUBSU4MDgaRAg6aqCgsuvIP/vyxaio6JjAUK/HaPLKv0JugFTHm4DCaABfEbwkebEw Me3w5ijYThfjVCSYRW3Vve2UKzznkk455YfVOmjlLGCO0QqQBZ4/6PD/OqrmjrrN9vEo o/yUZhQ4NO9oevsdd8eDc/IResyGhuMfQs36iSMP0FzSX9h8fhrOAS2NdkMO0uF/Jtc8 8HS2c6YccCo9wXQC3WnGdbpaCHDZFn5/GlVJltGmDjiDDKs7LLmNTDarm/KLiEE/vNl+ zEkq+8XOPPMNu3iNMoRJRyMfBQfQWybZeivJndBoyOwVJ0qArQY7ozM939bSUm24mTsB gVAg== X-Gm-Message-State: AOJu0YyJqe9heo1FzxDiAuCTsyv0581xZ/IAaeu4+GG8fmqwowGlb6Vu Y2BoHc/eQoYazXtrMpGPGhBpdBkWKqy7XDdl/BwS3GoIGJ692+8vA8uz0MtF X-Google-Smtp-Source: AGHT+IEo9vYhdmdhTTyzRykAU2lQtbCIHqAiv6NONBaQTuDxzDxQUIAWGUwMiUZ5CfQCbzjr2dqOkw== X-Received: by 2002:a17:90b:1c81:b0:2e2:ba35:3573 with SMTP id 98e67ed59e1d1-2e93c1a62a5mr9096689a91.20.1730464864712; Fri, 01 Nov 2024 05:41:04 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:04 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:21 +0900 Message-ID: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * doc/guix.texi (Log Rotation): Use @table @code for anonip-configuration doc. Change-Id: Ib6f8136715ecabc81d53dc13a14f4b111302c5c9 --- doc/guix.texi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) base-commit: 4009d1de954d694cb11af391d4113d29c5c1379d diff --git a/doc/guix.texi b/doc/guix.texi index 5768e195b0..b519b483fe 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20788,30 +20788,30 @@ Log Rotation The following optional settings may be provided: -@table @asis -@item @code{skip-private?} +@table @code +@item skip-private? When @code{#true} do not mask addresses in private ranges. -@item @code{column} +@item column A 1-based indexed column number. Assume IP address is in the specified column (default is 1). -@item @code{replacement} +@item replacement Replacement string in case address parsing fails, e.g. @code{"0.0.0.0"}. -@item @code{ipv4mask} +@item ipv4mask Number of bits to mask in IPv4 addresses. -@item @code{ipv6mask} +@item ipv6mask Number of bits to mask in IPv6 addresses. -@item @code{increment} +@item increment Increment the IP address by the given number. By default this is zero. -@item @code{delimiter} +@item delimiter Log delimiter string. -@item @code{regex} +@item regex Regular expression for detecting IP addresses. Use this instead of @code{column}. @end table @end deftp From patchwork Fri Nov 1 12:39:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32774 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 56AA727BBE9; Fri, 1 Nov 2024 12:43:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 5369727BBE2 for ; Fri, 1 Nov 2024 12:43:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qzZ-0007fU-JB; Fri, 01 Nov 2024 08:43:05 -0400 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 1t6qzY-0007f3-HD for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t6qzX-0000R9-RW; Fri, 01 Nov 2024 08:43:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=qf0r4HKyASTY+q1TBGBbLe6SylysIGgn1w+gMN9zG4o=; b=k2i7TU4J9QD3Xpdnak/4TYg8o2MbhRjFsHP1AMfpHka5W2RMVTADMGvoMfNNQ1M6D9Sm3V2phjWyxQvdNVcTQ4+0KPSNL8Pb5C5jlEYUqF5MNV6G4zx2URyZRDZ1P7urJxCq/HJYdDH5DsxVY/SmidD8CVUW70v1JADoOStkP/wPjv6eK5ZhJjd3ciAoLwNm86rE5qFA6EPCkhrKWJMQBelQETRR/MI90eDXG1sGQKvhifewzy+1tP7BUwf625N6N5o1YdA2G7Wd47HEwaguJ+xMnE7GyPJjjWYOaHINqfBHTIDBykUAY0ZqkpHmB23bq7CaSc2yL4FxftVeOmyGRA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qzX-0007vI-Kx; Fri, 01 Nov 2024 08:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 2/9] services: anonip: Add 'debug?' configuration field. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046493730343 (code B ref 74151); Fri, 01 Nov 2024 12:43:03 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:17 +0000 Received: from localhost ([127.0.0.1]:49209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qym-0007tJ-A0 for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:17 -0400 Received: from mail-pj1-f47.google.com ([209.85.216.47]:59642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qye-0007so-PV for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:12 -0400 Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2e30116efc9so1503246a91.2 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464868; x=1731069668; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qf0r4HKyASTY+q1TBGBbLe6SylysIGgn1w+gMN9zG4o=; b=egEEn/BlrYDUlOvMe9KVnQoUScRplFHikhkn8IKrO6Qw9Zpi1cCslLumX2dMHRFFey qV1VPL1ODfkJElrbXwRTackYLev3fQKMwbvKz3b9KrdM+3vIhip6BK0v2FLZ3LP1MK1H bVljD+JqjYVpRpQeBy5fIxwyio5dC59aUf6Mq7jPzVriifmJuAin7ZfJ3p7jVJhRbdTd oeS3bztCt02uLTsxu4NyfEL5P1BAtgxaFIjfwndEqAc7iIg+jnHGDHRQ3a12WxjuIUtt xa9nLRLsOd7n/GKrIyCMGdVNWcVIl0H4RMKWRC+8jbThtpFBeBUlgaPJmjMoIeqFWVVP l25w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464868; x=1731069668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qf0r4HKyASTY+q1TBGBbLe6SylysIGgn1w+gMN9zG4o=; b=ImgVp7bIZDb6mAVs/1arBiTv8Obp0g3x+h8JOMC/T5ym4Z796Cw/zEmWs5MnRcEgOi yaAUTlWH0uKs1WqyKrXII2eV3VwD3x8uxSWLA58BIpo6tjTXeDt9H7/aWXhyVXNfPAAe p5ciL47kn9izv2DiK4OsCCASOBZ2WeWwG9MjI9OMqC7DoVXlv/BKlaXozeLuLbK4Cp3X dq3/pQNv0k+N6MUgwCwa33bEDeXiEB+O2ccQcXJF4jnrJfR81W22GSOKUJeIPyqp5bqM Dnvk0SDtrRGHNP0K3XpBDtTwIAm1t4l6aJtCUlFsqUNyR6eQp93FT3KYplOI8tS4no5F EOkA== X-Gm-Message-State: AOJu0YwwMPf6hZVTdwNYFPbmMsdFfWjMYeIoysqJyo4cHSa0m7rekDNs 2xBx8Qg9LF6VCUl2aIQBKRJYLjNFsN7sl/3ftJPmbFuR30z8p4THslKPauIu X-Google-Smtp-Source: AGHT+IGNon5hw67Fa//1UTyfgMCJi8yFph8Q1n9ELTZ6zTItG6ILZrYhkVI4Cs1SDwab7M0vgI1npA== X-Received: by 2002:a17:90a:f0d6:b0:2e2:b8d7:4bd1 with SMTP id 98e67ed59e1d1-2e8f10a6f4fmr26932307a91.30.1730464867574; Fri, 01 Nov 2024 05:41:07 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:07 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:22 +0900 Message-ID: <12708a075e13fc3acfb4f2685d561fd9ee481b87.1730464675.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/web.scm () [debug?]: New field. (anonip-shepherd-service): Honor it. * doc/guix.texi (Log Rotation) : Document it. Change-Id: Iaf57b5992808374b069a55c34a9adfdfe52b046c --- doc/guix.texi | 3 +++ gnu/services/web.scm | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b519b483fe..51a543d690 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20789,6 +20789,9 @@ Log Rotation The following optional settings may be provided: @table @code +@item debug? +Print debug messages when @code{#true}. + @item skip-private? When @code{#true} do not mask addresses in private ranges. diff --git a/gnu/services/web.scm b/gnu/services/web.scm index cc6f4e6d9b..cf3515bf70 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -220,6 +220,7 @@ (define-module (gnu services web) anonip-configuration-anonip anonip-configuration-input anonip-configuration-output + anonip-configuration-debug? anonip-configuration-skip-private? anonip-configuration-column anonip-configuration-replacement @@ -1448,6 +1449,8 @@ (define-record-type* (default anonip)) (input anonip-configuration-input) ;string (output anonip-configuration-output) ;string + (debug? anonip-configuration-debug? ;boolean + (default #f)) (skip-private? anonip-configuration-skip-private? ;boolean (default #f)) (column anonip-configuration-column ;number @@ -1503,14 +1506,15 @@ (define (anonip-shepherd-service config) "/bin/anonip") (string-append "--input=" #$input) (string-append "--output=" #$output)) + (if #$(anonip-configuration-debug? config) + '("--debug") (list)) (if #$(anonip-configuration-skip-private? config) '("--skip-private") (list)) '#$(optional anonip-configuration-column "--column") '#$(optional anonip-configuration-ipv4mask "--ipv4mask") '#$(optional anonip-configuration-ipv6mask "--ipv6mask") '#$(optional anonip-configuration-increment "--increment") - '#$(optional anonip-configuration-replacement - "--replacement") + '#$(optional anonip-configuration-replacement "--replacement") '#$(optional anonip-configuration-delimiter "--delimiter") '#$(optional anonip-configuration-regex "--regex")) ;; Run in a UTF-8 locale From patchwork Fri Nov 1 12:39:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32775 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 14DAA27BBEC; Fri, 1 Nov 2024 12:43:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 CE89427BBEA for ; Fri, 1 Nov 2024 12:43:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qzZ-0007fc-Uj; Fri, 01 Nov 2024 08:43:05 -0400 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 1t6qzY-0007f8-Ns for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t6qzY-0000RJ-EE for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=1o97jMQTV3I+A7SArMDjlozbs9qPGdGcGl8O/7GkqGo=; b=pAofRbnxToVi4RIqw1SV52z93/SrNkep7mbTbmgkTQAEJaOh+DXL67LXxLAqJC5Z9HoCVsCRwBEAS3LT3Gi23tNgh+4HwvrdjAK+5kNrrzZ15d2LYip74dTvcQmFnh9mJbqbfAH9gQAHqd9Oh3qK6PgUPzQjrkW+jJHAyPkMSNZZ58/9lDgT8CCnyEkG8Ws1esFg3QkMdEIIYAkuuVKCmY3NcZcX/mWBoLO17exAnhNu7UdQO3n9nLIZEgQnyArnpk991tKG3UBAbLiyYW59OhKzFO5PJeOqshO+Fuw4C4kZbFb3ooIRVPnsMlYCb9sBaftZVPtz4bfAY+WN2vRIzw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qzY-0007vQ-8o; Fri, 01 Nov 2024 08:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 3/9] system/vm: Fix virtual-machine bug. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046494030356 (code B ref 74151); Fri, 01 Nov 2024 12:43:04 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:20 +0000 Received: from localhost ([127.0.0.1]:49211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyn-0007tR-Cf for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:19 -0400 Received: from mail-pg1-f181.google.com ([209.85.215.181]:59757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyh-0007sr-Fi for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:13 -0400 Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-7ee020ec76dso1650815a12.3 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464870; x=1731069670; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1o97jMQTV3I+A7SArMDjlozbs9qPGdGcGl8O/7GkqGo=; b=WwOSH/ejflE723gP2hfJQFJuy4OaYIaqdKGZhfKAb+t0UJvyguUVVB97HBMwGKKGPN QA8ZXNVa7aIHSlXsFsuhuvx2D8lKfa0RlEJ1TEt8njcRgmd79w4MsosIYkw+/lRx6Ry4 kifa2ahpI6qR5uoQWlVr7XPJ8OmjxnTSgYmL7CQC3W87QB42fswrzZo0x1tPPsHBZZDR 1nTk2iANDJs2VQr8iIY3ZtGyjg82NH0ZDJid+WfD3UcLFynJO1IPTCs2bjB4xKzo6UOS v2u4A1k18k3dgqS7B0ikOvdSEnWn38WqeQuqJ6OlNh3o9sTKNVq5p7H2agOls/XBzFPn 4YaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464870; x=1731069670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1o97jMQTV3I+A7SArMDjlozbs9qPGdGcGl8O/7GkqGo=; b=wAOzDt63W0VpgK/ZXxiBqbp436nn0qJq6DR6xuBzPzREPKiLi/+OOZeY5PihzHMVWH P6AijU5LSOdNI4XwkynmHFsnwviujA9t0THr2PUucnx8oPnROD2EmRn4tK3MtLlZemoL mE9ml9INYcj7nwDgL56zqzyLifu4+lCTRd4hXsCHmJxD73O8xR/J3QCffdNvtK8Oh4XE 8ED5VBi6p80XvqPkYbUCp61dEBrJ3O18aJ/CpnIz4yY+Fqa3aUq45ZMhxH0l+q6m3Gw6 yKeBh6vqTqJhQZoJzaoi/pzVmlfVGtCTfVoB3c0X21zbbDhuZm9k8Y6CphoL91DGj6Vc 8n3A== X-Gm-Message-State: AOJu0Yw3YNYrG2V3qhNc5Y1kFimfWTcH50byMeIAusfsvy/llIg4eL8H pVktxbtSdMKD7VVx2RfE+3x5Oghrq8FJxm2BzNv3M6ankVJDwtCzrcv4Nnvd X-Google-Smtp-Source: AGHT+IGL+kPiMMIaJZ/W8dkVF5rMY/ngcBgH9wBZP8bt9+gAlYlpUQbhOflRfDxLkoJdSvCCtGDhUA== X-Received: by 2002:a17:90a:468c:b0:2e2:dd25:9b00 with SMTP id 98e67ed59e1d1-2e8f10723fbmr24691162a91.22.1730464870371; Fri, 01 Nov 2024 05:41:10 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:09 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:23 +0900 Message-ID: <397067fb8b2b50efef8092d77c93c04e0f28225a.1730464675.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The virtual-machine syntax would not accept a single operating-system field, which was puzzling. * gnu/system/vm.scm (virtual-machine): Add a pattern matching a single literal 'operating-system' field and value. Change-Id: If207fd71df3a3f763b2e63229eafa82f63e80773 --- gnu/system/vm.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index a2743453e7..4a400056d7 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -422,10 +422,14 @@ (define-record-type* %virtual-machine (default #f))) (define-syntax virtual-machine - (syntax-rules () + (syntax-rules (operating-system) "Declare a virtual machine running the specified OS, with the given options." - ((_ os) ;shortcut + ((_ (operating-system os)) + ;; Also accept the long form (virtual-machine (operating-system os)), for + ;; correctness. + (%virtual-machine (operating-system os))) + ((_ os) ;shortcut (%virtual-machine (operating-system os))) ((_ fields ...) (%virtual-machine fields ...)))) From patchwork Fri Nov 1 12:39:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32772 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 790B027BBEB; Fri, 1 Nov 2024 12:43:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 4962727BBE9 for ; Fri, 1 Nov 2024 12:43:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qza-0007fi-Dc; Fri, 01 Nov 2024 08:43:06 -0400 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 1t6qzZ-0007fS-AD for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t6qzZ-0000RV-15 for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=SJpPkSjz1IfrJUr5PMcd6jRbpExBc/JgBjrrn0/JmYY=; b=LdytDNw9qAscCu196WtoPhhqukrqimXIqB9DyTN813pL/QhwyvDpTuOQMRXDsN/ur3oSQCMsFVeTEKM/ZvVUMlgEYZTrsXFeRqmgmoYQqGoT1KCeRzwI30BfwVHDvL3AF1Qif/mKU2DyY92G0aNHWIf95GTLsN1Q+K3vZH2LZPnnM4Ibtw7Sgc2baJ3Y+LakGYaoKVLl99Y8EJToHBHbJ7CscrJ2NM5ODuXOYfAkAvsY5kps19N7UnPsLRfi7EagkBj67swC+9RSAwx6mOidfOh4Y22IZEDRzzd9j8o9G7J3bsZ/QsmzN+rUUA/Tthwi/IKsrda4La/XhHjhrunhnQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qzY-0007vY-RI; Fri, 01 Nov 2024 08:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 4/9] tests: web: Have the retry-on-error throw on exhausted attempts. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046494130370 (code B ref 74151); Fri, 01 Nov 2024 12:43:04 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:21 +0000 Received: from localhost ([127.0.0.1]:49217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyr-0007tm-14 for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:21 -0400 Received: from mail-pg1-f171.google.com ([209.85.215.171]:48358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyp-0007tA-9h for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:19 -0400 Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-7ed9c16f687so1418153a12.0 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464873; x=1731069673; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SJpPkSjz1IfrJUr5PMcd6jRbpExBc/JgBjrrn0/JmYY=; b=P/dZsnUvDr/2FU6PI8RTJoPPmBegF3KCTieWbLU4hKKzDUUO4xAM1PqMH0HGdJnTNZ nMLM/R8yNJy/bg4yBfj68lppfj3vBVh3Xfx4SlRub+lJODP3cyBCgk9wY25WY9MEun0q vLBqCyl98hR/cZpmBy60a4FXHEGKu5OwDkVOn1C0lVemD2HynYo/i60W4ravDTy/qIAM fjo3ThL0Qkir1r2fnZEsUJe6MJ8/7bcjA6yM5WPWnY6WM7knWAhyKQKneM27Of3zcfxk v6Dp+japFjrLUIzQMpbkpxI5f/nQ9zuXt7Z1bbWBhaZFUpiDtiNMoRcoTMxRU8ed0pdO ohxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464873; x=1731069673; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SJpPkSjz1IfrJUr5PMcd6jRbpExBc/JgBjrrn0/JmYY=; b=DNuTVSqkSTzs4PqgUoCCZXZrkfZNdMs98mAODPyWmm/vgCN2F3DFVdd5NY/cV+fCkG tBam0oljecHCpe6J8+1ITknkVZ5zLgI9Nq33o6XEo/7u/24hhJ4uF66XMCcD71KxqdQx zXZ4LVG4Xj6DtC8/a1wVSM0+DuC2N3Xt8FiRn1KY0MyYrW/6fyckZBYLO4pde5dhqgm4 MQvgdp24ybXb46ucYLh8rjqRFXnQBbh90htt8X1BGLREXo8BdKvs7SqccWVVxuW50FVY PFjB7jL+xdyEqy/PjhbwHx67dsmumUbCYET4S3NLg2yZTQc9ZsjFfw7L+PfRpgDbwGw/ /lYA== X-Gm-Message-State: AOJu0Yz9eyZ81ZcAANMNYB+coDKiNcpTqaUc3/OOoGMGDI5DLdUOtsPk x9KpO382mU7A3LsUjBD/E84V1wZBe1wktHIJwIrA25Arss/MpfEnVcQ7EY5W X-Google-Smtp-Source: AGHT+IEHEFC0MSi0+ZeYFbZamUabcvGR4Njl2+WxjREBrfX2AMX1rGBKjUP2RZREr9bQwGA1p5ZnPQ== X-Received: by 2002:a17:90b:5243:b0:2e2:cf6d:33fd with SMTP id 98e67ed59e1d1-2e93c1d3945mr8362907a91.31.1730464873239; Fri, 01 Nov 2024 05:41:13 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:12 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:24 +0900 Message-ID: <369fbb0b1eb904bf152356be15441aaed872c44a.1730464675.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Previously, it'd simply return the error arguments, which would not always fail a 'test-assert' test, for example. * gnu/tests/web.scm (retry-on-error): Re-throw the error when the attempts have been exhausted. Change-Id: Ic1468d8ba23f0f78377e90d19bccb2878dc56f0e --- gnu/tests/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index a071e05e1d..5c50322cef 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -83,7 +83,7 @@ (define retry-on-error return-value) ((#f . error-args) (if (>= attempt times) - error-args + (apply throw error-args) (begin (sleep delay) (loop (+ 1 attempt))))))))) From patchwork Fri Nov 1 12:39:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32779 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 9E4E527BBEA; Fri, 1 Nov 2024 12:44:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 677B727BBE2 for ; Fri, 1 Nov 2024 12:44:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qzd-0007hC-8u; Fri, 01 Nov 2024 08:43:09 -0400 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 1t6qza-0007fq-Ev for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t6qza-0000Rn-6L for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=RrlXUF6m13LoK09KHFlvVTrCOKhX2H/GiKuTk7CoCgw=; b=e+qjHAnuo1p6TryZOBtOCxz/qZQo97kLLAeMDLs9Iq7qmp+2QljXhfEqtzIPbyUXS9LazXWNgPt85cBIpE2CewzGFITHQzfsc/IiyNS3y+wQC4OpffRkgpotLvUU758c39KMAkdZYh8zv4JcVURIWzHpIs585jf/ZlCCEFNzKwXXX5I4V+ayD4KUI8PvvhUriiSmziDkyTR3Nj+kh4h3ekFmKsrBOdUzLESIHvT0kjzDeK1Y/ipl65j0L7qSWDW9FHd+gJ848B9XzmjPf58ivVDv59uHHKxD3SdagkbvPP0S84DgH2XTxfiMZE6KgBQ0bCTH58JpQ2NyOOrTRGKKeg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qza-0007vo-0H; Fri, 01 Nov 2024 08:43:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 5/9] services: herd: Export 'eval-there' in API. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046494630392 (code B ref 74151); Fri, 01 Nov 2024 12:43:05 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:26 +0000 Received: from localhost ([127.0.0.1]:49222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyv-0007u2-VO for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:26 -0400 Received: from mail-pg1-f182.google.com ([209.85.215.182]:46442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qys-0007tL-4K for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:22 -0400 Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7ea16c7759cso1199511a12.1 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464876; x=1731069676; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RrlXUF6m13LoK09KHFlvVTrCOKhX2H/GiKuTk7CoCgw=; b=JsW8rqYQJH37Q+eGO6Dn5FhMTJPFOLi1laX8xGXAFp9vosZ0WHVBXyFhqvR3d53bND P7O9frinFMtMNVUdpXVlpJ5h1O+pXvsuDqI0Ib7tJwrIqyJC8kGf5jGuAkvauB8utymA QdcdRukHBwEWB9f5LOwbfbHeqzAdn4KXg/5uye+OA15ItDeJRpL9i92kdUb2+Yy9Hje+ Wevb/0UQyVky9y2sIPX61Yl/GMoa72+qqhJU2WzrVb2lISsp9BgqmOjAz/YsKSk+3p1K 8hmmzJNxRRVyKpKSAXrGkOrq4NN1JpLxXoLLsz4BWfZAgf32iHIhAxTB61maspNSLP4C S/YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464876; x=1731069676; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RrlXUF6m13LoK09KHFlvVTrCOKhX2H/GiKuTk7CoCgw=; b=FWWRbycVFxJ8yPydvge3eMlLyVPSR++xoHSZEUyaBCht0oZwlIQjYSOKJZWozkDfB3 dERxGKKyuCjR2aLCW4ELMUPMO4dbtWYUU2ZNod+Exa1Y8lG1MQGo8pnnwU+iiGpGhx8E 6GAnpC3a91SP9fRB9DWFp1NfFFIoXY39dBYWzxkTjIkmViHATMKVJ6pDxVuIi5UU0Kp6 /HQfcqO9B+joMamwpw42RTogE+I1Y0IgRPi83zr1YN+L9woKz7gR2vdGvQBoB1N96/N5 QxpxsXcKkfUdNheHrQFzLqKgmYlBt2+clCJgktMzQ9JgNmQfkvbAA58UZfeKmPdt2yJQ VXpw== X-Gm-Message-State: AOJu0Yy9EvBe3YRvS+MrcpWDJZd/m9kXH2FbOQW3WEPvnywLnmOgpT0P +Ii8gFu2gMxgK7EHuxyMJSYqp3e5m2P2di9lhWuJSG5+OWebdpUQGg60jlON X-Google-Smtp-Source: AGHT+IEwHM/t/gPVlEx7lut9irPcVopS0EEi+LM/8WyKYbGrnMCZe9RDTpq8+PRcRaKRSXMQiWxeCw== X-Received: by 2002:a17:90b:2b50:b0:2e2:9a48:dbb7 with SMTP id 98e67ed59e1d1-2e93c1e7db6mr8775300a91.29.1730464876056; Fri, 01 Nov 2024 05:41:16 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:15 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:25 +0900 Message-ID: <8c8215ff6140a98c412bb2df5faf19767635ea6b.1730464675.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/herd.scm (gnu): Export 'eval-there', which is useful to evaluate Scheme expressions. Change-Id: Iff1db56e0847fc5886ac9fe594d677b363e7e6e7 --- gnu/services/herd.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm index 4b47acf72a..c185fc2cec 100644 --- a/gnu/services/herd.scm +++ b/gnu/services/herd.scm @@ -54,6 +54,7 @@ (define-module (gnu services herd) with-shepherd-action current-service current-services + eval-there unload-services unload-service load-services From patchwork Fri Nov 1 12:39:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32776 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 6B09D27BBEA; Fri, 1 Nov 2024 12:43:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 CB0DA27BBE9 for ; Fri, 1 Nov 2024 12:43:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qzc-0007h2-JS; Fri, 01 Nov 2024 08:43:08 -0400 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 1t6qza-0007fd-0x for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t6qzZ-0000Rc-K2 for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=iukoIGWAYcPgxEkZ4B04z0S8ROC7zj3+LV3dN94ixVE=; b=XaqFLtCCbNYgzl/qOVF3xRmjRBVOwQzj/tS8wShOu2Fwa0kI4v15gRokHAIqMHoX17HfATRA8iZIcLRFYQSDtVmqpd/HtlXuERlLj9NkGLfgUCto5Z6v6qB9XSLRLcFJWxNRfkytauACWG1b545puR8fS6itPYKq3NpDiHY89EkD2bHFp3WyuRvm7S3aTAOr/OAEYp5/ukPNcm6mstHl6xFSOsO509PzSOHyEC2L4z3p3JE2r4Ru+75aJBIAzFxHROB91VqXGEt7KHc/ltoyfeShcpKVQP57ZueAovA2BGR908mtDWjQ2hpmMCdxufROOM8as4Sun0Hkhyzpf6ET3Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qzZ-0007vg-D9; Fri, 01 Nov 2024 08:43:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 6/9] build: marionette: Make it possible to reboot VM during tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046494630385 (code B ref 74151); Fri, 01 Nov 2024 12:43:05 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:26 +0000 Received: from localhost ([127.0.0.1]:49220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyv-0007tz-Ds for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:25 -0400 Received: from mail-pg1-f173.google.com ([209.85.215.173]:51249) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyq-0007tU-37 for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:20 -0400 Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-7ede82dbb63so1197094a12.2 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464879; x=1731069679; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iukoIGWAYcPgxEkZ4B04z0S8ROC7zj3+LV3dN94ixVE=; b=CRbYFF7f3fnPYNStzytDKVHQpfJcrrGXrZmJQ+Qhc4nY1xGTJFcenPJwFqHnCsUCt1 V8UMUgLOpVDMVdcWnnFF//PVKTOHhpS4JWDOXge/jANPyarlelBQgg2uP0GoXPjV9s/U 9ACnmWNfydzCAWwt4/I1SsTyXFiljGf2tBnGXUaMRowo1AFSMg3a2t+JX9HXm89f6Kca b+bKrcBzF3Oi27d7ClIVSnGKpWSWxo3Bxc9/tGqywkvDZqucSe3IYjDZcrRNenTlPWBO Ie0U9s4tq3wKk3Bl+dIrMABTDL1LchAtaUoL5fio2vysikWDaGSP3WAN341r2sio72eJ IYZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464879; x=1731069679; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iukoIGWAYcPgxEkZ4B04z0S8ROC7zj3+LV3dN94ixVE=; b=picq0RqJt51jdORr99Rg1CArYPB4yOYdWg8j1Nt6Ae0wxlD6QuJqS8Bd2fvnN/groM F/of6vnV8WuVBbP0UUEI0aGeyyfkDkOLJp/ft+vHU5T/a2lTvzE4oOrKLQhpmKyaLrUU R2hN2EikLv8F3kWaOvKW5W15jTYGnTpGKcgkaCAB/KO0ZWkBzmhBWJXiIyyzqD84Rm8q dSY2X9v7F5IIvHmtMiP0QVumeNArM/U6iPkc70l++epmnhpdRzLidTwyhdUKIGlmgBn4 /YrYxf2wipGE3xXjr/eKWnZhgGC8mh5ofYcjKyAhEB+jr4YMbIUhloigJ6rZXo+2iM27 j/Rw== X-Gm-Message-State: AOJu0Yxt1afCHqD5ZA6cTDL4yV0k4E9Bu3/5i6HshQJI5xaotgvNdFLt PCOwDBPWkN42N4V7nnT1C3yGxRh8sCKCaCLEseUpP9sHj3AsMaMgUgE3kyxv X-Google-Smtp-Source: AGHT+IFjFCx8ICdOsMP1EvlQjyZhYuW3ShjLR9/A4j6V2eXaTjVbRdMIg+IBEqXFrXVpFsVoGag8hg== X-Received: by 2002:a17:90b:4a49:b0:2e2:b64e:f506 with SMTP id 98e67ed59e1d1-2e94c2afe78mr4825848a91.13.1730464879033; Fri, 01 Nov 2024 05:41:19 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:18 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:26 +0900 Message-ID: <5d9173bd000c54075dc8b666dc0fcc8aa262f13a.1730464675.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/build/marionette.scm (make-marionette): Add 'reconnect=1' socket parameter. * gnu/system/vm.scm (common-qemu-options): Remove '-no-reboot' option. Change-Id: I5e100543ddddba0aea3ebe4e2f5cb8b0261c0d73 --- gnu/build/marionette.scm | 2 +- gnu/system/vm.scm | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 0b0a8a70d8..af211eff43 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -108,7 +108,7 @@ (define* (make-marionette command (list "-nographic" "-monitor" (string-append "unix:" socket-directory "/monitor") "-chardev" (string-append "socket,id=repl,path=" socket-directory - "/repl") + "/repl,reconnect=1") "-chardev" (string-append "socket,id=qga,server=on,wait=off,path=" socket-directory "/qemu-ga") diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 4a400056d7..1e3f72c7b2 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -227,7 +227,6 @@ (define* (common-qemu-options image shared-fs '("-enable-kvm") '()) - "-no-reboot" "-object" "rng-random,filename=/dev/urandom,id=guix-vm-rng" "-device" "virtio-rng-pci,rng=guix-vm-rng" From patchwork Fri Nov 1 12:39:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32777 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 E39F527BBE9; Fri, 1 Nov 2024 12:43:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 513BF27BBE2 for ; Fri, 1 Nov 2024 12:43:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qzc-0007hA-Rq; Fri, 01 Nov 2024 08:43:08 -0400 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 1t6qzb-0007gW-5T for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t6qza-0000Ru-PP for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=kMjCf3cPPZRr8OCAqtYI6tknoCszAU8a+phN/eICsWk=; b=v31Go2AVvDNHKcTn/IeDRT7e5MUkypYIXSSm63hoh5r6oQ7fN6NkTHiRo6PZ+dq1ZTHMasapkVKubqO1uf9JLkCm2uh663BCcEDNEKKbwKnFVPHL0xI3QePOV7FGaRmIAcREbc/kWtJav6o43T47JIYKXsvuSXXj34hkSgtxyKloZoStuzymRCRNac1mcy5pWnd4yMrsiHUiBaK2+jHWpqct8TR34vq4K9aAVJdYtxMpeIh6FRkole+79W34RKYrUc1mHIzNdfi1/ZzKufkLQqcbthbDgJTremHUhSvZpdukzrIxWz2GaIZhWOJdocS0pwEGf6xUjSJ0ntp7aYJWtQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qza-0007vw-I7; Fri, 01 Nov 2024 08:43:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 7/9] tests: Add anonip system test. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046495230414 (code B ref 74151); Fri, 01 Nov 2024 12:43:06 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:32 +0000 Received: from localhost ([127.0.0.1]:49226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qz1-0007uU-Hx for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:32 -0400 Received: from mail-pl1-f169.google.com ([209.85.214.169]:56470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qyy-0007tu-79 for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:30 -0400 Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-20cf6eea3c0so16443585ad.0 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464882; x=1731069682; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kMjCf3cPPZRr8OCAqtYI6tknoCszAU8a+phN/eICsWk=; b=ZunRk6dLYBOp4Co2E48c78JsHeEU9J/3ppfXwNneQd6Fkn2HkwYzM4FomarDoYLc26 1NU5ler9G05v9QiIgPOSmnr4l4LGU40bClX3kGKrEGiv71FC4Qv+u6fFnB2nd3cdJgI0 YUhIRf05aWo73/T+24vmdhEvdomeP3xK9RHZP2Qv5jnKWBy7q6GBtLCzuTh/w3RB7lAq zZC480rv7tYMd81wdaeIj79N6w6bmBVrCATak9ozqX3HxfCvPjl65L3BbrioXRyJ3h34 /1D0kIQmqMOyHRcrroaegO54wsDa5L9ZVCnhSaMlf5WIObOLWvleLlxNO/OKmtf5JBpu LXuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464882; x=1731069682; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kMjCf3cPPZRr8OCAqtYI6tknoCszAU8a+phN/eICsWk=; b=RxslGkTMu8CB4rrbXiyCXLaziVX+8tZzVoO1v4PJwxdjVMa5d75Q+/fnTDAB/pqPrC aNDMgu6EGyb5NEAoEGEfy4XKzzLEA3HedXm3arILxn95CL1886gcUJEZPMiZuH9sKTx4 QMDSaKe3Xf9a4heGQZfTI8tEgfK+rT+pezur8jJFBRX7EL8jLpJuMLnyMHaEDfY1aEqZ A0Ja2DgwuSBFUzDWbQNa9Qcgx5xH3PJmdWogpJH8uMj8JCe8/tPZrtGGV0En1WveutzQ mdYnQFWiPLJv5NYplJKWcFJZGEyqYMvxUEnopeG63g+BNyslrQ/vKcS9X9eSW9zWzo2Z BceA== X-Gm-Message-State: AOJu0YzpQiP93tdL+7ZRUvAXvoJh7JkpxARQI8vHpyKxIxLZnORPUW5Y Ye7Z2VWpb7dAnXlJN2h55R2hvVeVSNYyJXGCHjIkbPrnhfCB02uKrwOGOATV X-Google-Smtp-Source: AGHT+IHXgUlU0aGzZssVqVXOtvsA7sBwtPCwweWxoR8L7CDgpWr1n2A6xzPBgo2C68RKhGX+B/nf6g== X-Received: by 2002:a17:902:d485:b0:20c:7c09:b2ac with SMTP id d9443c01a7336-210c6c5db72mr278342325ad.52.1730464881901; Fri, 01 Nov 2024 05:41:21 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:21 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:27 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/tests/web.scm (%test-anonip): New test. (%anonip-os): New variables. (run-anonip-test): New procedure. Change-Id: Ieed210a784dbdeee8a498e74b6c0e31cb72cd9b8 --- gnu/tests/web.scm | 122 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 5c50322cef..6ef32138ed 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2024 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (define-module (gnu tests web) #:use-module (gnu services networking) #:use-module (gnu services shepherd) #:use-module (gnu services mail) + #:use-module (gnu packages base) #:use-module (gnu packages databases) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages patchutils) @@ -52,6 +54,7 @@ (define-module (gnu tests web) %test-php-fpm %test-hpcguix-web %test-tailon + %test-anonip %test-patchwork %test-agate)) @@ -509,6 +512,125 @@ (define %test-tailon (description "Connect to a running Tailon server.") (value (run-tailon-test)))) + +;;; +;;; Anonip +;;; +(define %anonip-os + ;; Operating system under test. + (simple-operating-system + (service anonip-service-type + (anonip-configuration + (input "/var/run/anonip/access.log") + (output "/var/log/anonip/access.log") + (debug? #t))))) + +(define (run-anonip-test) + (define os + (marionette-operating-system + %anonip-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine + (operating-system os) + ;; We are interested in verifying if anonip still launches following a + ;; reboot; thus make the base image writable. + (volatile? #f))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (ice-9 match) + (srfi srfi-64) + (gnu build marionette)) + + (define marionette + (make-marionette (list #$vm))) + + (test-runner-current (system-test-runner #$output)) + (test-begin "anonip") + + (test-assert "service is running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (wait-for-service 'anonip-/var/log/anonip/access.log)) + marionette)) + + (test-assert "service can be restarted" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (restart-service 'anonip-/var/log/anonip/access.log) + (wait-for-service 'anonip-/var/log/anonip/access.log)) + marionette)) + + (test-assert "ip addresses are anonymized" + (marionette-eval + '(begin + (use-modules (ice-9 textual-ports)) + (call-with-output-file "/var/run/anonip/access.log" + (lambda (port) + (display "192.168.100.200 - - \ +[30/Oct/2024:14:57:44 +0100] GET /xxx.narinfo HTTP/1.1\" 200 1065 \ +\"-\" \"GNU Guile\"\n" port) + (display "2001:0db8:85a3:0000:0000:8a2e:0370:7334 - - \ +[30/Oct/2024:14:57:44 +0100] \"GET /xxx.narinfo HTTP/1.1\" 200 1065 \ +\"-\" \"GNU Guile\"\n" port))) + (#$retry-on-error + (lambda () + (call-with-input-file "/var/log/anonip/access.log" + (lambda (port) + (let ((content (get-string-all port))) + ;; The expected values are taken from anonip's test + ;; suite (see its test_module.py file). + (or (and (string-contains content "192.168.96.0") + (string-contains content "2001:db8:85a0::")) + (error "could not find expected anonymized IPs" + content)))))) + #:times 20 + #:delay 1)) + marionette)) + + (test-assert "service is running after reboot" + (begin + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (eval-there '(begin + (use-modules (shepherd system)) + (sync) ;ensure the log is fully written + (reboot)))) + marionette) + ;; Note: a distinct marionette-eval call is needed here; if + ;; included in the previous one issuing the reboot, + ;; 'wait-for-service' would apparently run before the system had + ;; rebooted (and succeed), which would defeat the test. + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (wait-for-service 'anonip-/var/log/anonip/access.log)) + marionette))) + + (test-assert "service can be stopped" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (stop-service 'anonip-/var/log/anonip/access.log)) + marionette)) + + (test-end)))) + + (gexp->derivation "anonip-test" test)) + +(define %test-anonip + (system-test + (name "anonip") + (description "Anonymize logs via Anonip") + (value (run-anonip-test)))) + ;;; ;;; Patchwork From patchwork Fri Nov 1 12:39:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32773 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 CBF6327BBE9; Fri, 1 Nov 2024 12:43:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 3530627BBE2 for ; Fri, 1 Nov 2024 12:43:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qzd-0007hJ-S6; Fri, 01 Nov 2024 08:43:09 -0400 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 1t6qzc-0007gs-0t for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t6qzb-0000S3-N4 for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=8UTuJuNh7k/I2ncvFzkLnyp0vTpfA5rcoq2DKqQOEaY=; b=aAGF+EWq9PrQS/cwlBO8eNLFZWXm120XuHSHkzlJKtCwZEwz1Xli+DkkYyiShhZKsXgeB7mPipxPCkhm2pwkzzQQB0g51L++xX4C/Fd8NHmdxiscVwlsLb1EUrcIVfDMFopWycG7vdwjgCKOnv4+JEj9COW8S7wZYMqLAts7Vi3Gd9L7DzgotwKw5ws9jzRwmHJ6Zvqylrnv5NYa4JJYkzoezz111YOGIUmobagczCea2VAq3g/Von+mxrxCkIgBeYEN9rV8BlCHr2QJx8GNjg+c1PfGNMLOpO7DgfWps1Cdtk++NRCJFV5k5bSXgebQFI27od95q4m8VjNLzinl1w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qzb-0007w5-7A; Fri, 01 Nov 2024 08:43:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 8/9] tests: web: Add nginx+anonip test. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046495430421 (code B ref 74151); Fri, 01 Nov 2024 12:43:07 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:34 +0000 Received: from localhost ([127.0.0.1]:49228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qz3-0007ub-Ht for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:34 -0400 Received: from mail-pg1-f181.google.com ([209.85.215.181]:59596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qz0-0007u0-RJ for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:31 -0400 Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-7db238d07b3so1515270a12.2 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464885; x=1731069685; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8UTuJuNh7k/I2ncvFzkLnyp0vTpfA5rcoq2DKqQOEaY=; b=BP3HUdhCnm3ZiZlmr7w1nWgK8ECxt9k8Uc/TViLlM4vC1MHJuHFO8EKLnFfP471GGT mqeCZJTUpvIvaCsW4f2s3LPPT+s5SVHa20t9cNV0JlNbEKWFgxfTVAcUkPS1OBuoHjcC 8j0DrKXpWsAy/0KwVC7X1iD6T/4D+lODBOGHrs0UaJrYPUyyeZoYlSt/Gp001YmCWHNI JXTK9LXNnxa4+6/IwPdifLPGsJisu8tqdOOknA31RCe1pj2KJLhwUMW/XhjOCrv9c90q nyQkRE3QcWtUYCFFUdRSfb349uLnVGVKKLdbQNlcfbudLma5QHqxhOn9RK65xxEUF4Ck FmBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464885; x=1731069685; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8UTuJuNh7k/I2ncvFzkLnyp0vTpfA5rcoq2DKqQOEaY=; b=GEAnA+mNpbwrHUX5RzUlYmpFlVzFDPBYIykbUoFCaDW9y1s6dVt3sMcIkFoGKna0Ox T8i3awu/WW1fTJT9GdxbgdO1+X7mdp62W7eiHKh8HYVOOrOFZPIFAf9NR/LrjHmjaxy7 MD3XNbSXIkczhV/mqVFAbdvkqLvJWxJvmRlcgHSoVK8o3YNDqfMaCPUVIegq/KmLsISI pzfqYazb8roXHUVx5ownD2PYxLwyHxJ2snLTTZThQHJKsd5L+0jzF/sKD7gntVj91PKO 00t+zCQ3k8FU1YKFoGPlwmMSH1UBrgirP90aHSphPPNQq91wsv8m6hE/0a5LXSGlCzQK IazA== X-Gm-Message-State: AOJu0YztDgBIbi1HC8R7VTYKga8enqH7O0UfYdsDa3/w9Af2YKyoSeMY nLjq5t6x9mdHNTXeVHD932vG18wtDaCWU8H3CWN9/SaV+YX5WYKCzhbPbfCO X-Google-Smtp-Source: AGHT+IG/BE+0gTjT++uyt2z4nnv3JFJqEy0509Co6xGoCv8U/1OkoGXOzUJ1MGXYeTmYe8chdmyP0w== X-Received: by 2002:a17:90b:5201:b0:2e2:cc47:f1b0 with SMTP id 98e67ed59e1d1-2e8f0f53f3cmr24245977a91.3.1730464884765; Fri, 01 Nov 2024 05:41:24 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:24 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:28 +0900 Message-ID: <6099a6852bb8bdc693b273f3a7129767d8aabffc.1730464675.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This test reproduces the problem reported in bug #59181 ("[berlin] web services fail to start on reboot due to anonip"). * gnu/tests/web.scm (run-webserver-test) : New keyword argument. (%nginx+anonip-os, nginx-anonip-tests, %test-nginx+anonip): New variables. Change-Id: I7bbc8fb9f2ab33ce89bf1c0945d7ddbddf26a7ea --- New commit in v2 gnu/tests/web.scm | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 6ef32138ed..33e0a697a8 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -50,6 +50,7 @@ (define-module (gnu tests web) #:use-module (ice-9 match) #:export (%test-httpd %test-nginx + %test-nginx+anonip %test-varnish %test-php-fpm %test-hpcguix-web @@ -91,9 +92,11 @@ (define retry-on-error (sleep delay) (loop (+ 1 attempt))))))))) -(define* (run-webserver-test name test-os #:key (log-file #f) (http-port 8080)) - "Run tests in %NGINX-OS, which has nginx running and listening on -HTTP-PORT." +(define* (run-webserver-test name test-os #:key (log-file #f) (http-port 8080) + extra-tests) + "Run tests in %NGINX-OS, which has nginx running and listening on HTTP-PORT. +EXTRA-TESTS should be a sexp of gexp containing extra code to run as part of +the tests." (define os (marionette-operating-system test-os @@ -154,6 +157,8 @@ (define* (run-webserver-test name test-os #:key (log-file #f) (http-port 8080)) marionette))) '()) + #$extra-tests + (test-end)))) (gexp->derivation (string-append name "-test") test)) @@ -209,6 +214,38 @@ (define %test-nginx (value (run-webserver-test name %nginx-os #:log-file "/var/log/nginx/access.log")))) +(define %nginx+anonip-os + (simple-operating-system + (service dhcp-client-service-type) + (service anonip-service-type + (anonip-configuration + (input "/var/run/anonip/access.log") + (output "/var/log/anonip/access.log") + (debug? #t))) + (service nginx-service-type + (nginx-configuration + (log-directory "/var/run/anonip/") + (server-blocks %nginx-servers) + (shepherd-requirement '(anonip-/var/log/anonip/access.log)))) + (simple-service 'make-http-root activation-service-type + %make-http-root))) + +(define nginx-anonip-tests + #~(test-assert "anonip service is running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (wait-for-service 'anonip-/var/log/anonip/access.log)) + marionette))) + +(define %test-nginx+anonip + (system-test + (name "nginx+anonip") + (description "Run a NGINX server with logs anonymized by Anonip") + (value (run-webserver-test "nginx" %nginx+anonip-os + #:log-file "/var/log/anonip/access.log" + #:extra-tests nginx-anonip-tests)))) + ;;; ;;; Varnish From patchwork Fri Nov 1 12:39:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32778 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 A0BD527BBEA; Fri, 1 Nov 2024 12:44:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 2111A27BBE2 for ; Fri, 1 Nov 2024 12:44:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6qzd-0007hI-RU; Fri, 01 Nov 2024 08:43:09 -0400 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 1t6qzc-0007h0-FU for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t6qzc-0000SG-6l for guix-patches@gnu.org; Fri, 01 Nov 2024 08:43:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=KGe8VyZN2Ra66xrmhWqWpZAX95htDF0u7v2gQpwIFQo=; b=QM00qrOVlfRFC1eqNDBtAPtk2qgpxH8n1DzrLc+a5TBE6R6fy+HrCATotPjI4rRLJ+6FQPmUmvayO5w55QldKR1zjRMjl+1cFinQF/Tpek/UwQzsGUs/BTcQqRZuWF7o2wZw9l0Z/3LS2YprfG5zzi39YAuKaFuyPfCnxH3zb+YVf0Mmi7vxsCwG/Kfvn/ZnZUUhspCgVuD+PmOvsGipCca3UCyTFM+GaXhNhZl4dEiSAUhz+foV9Y+7CS3jh9SdbgIKADPgalt1cxmfxDoix9Z7klXdjS5XdK9SakayycdxOMeo9xeo0EKTfDorr0i/JHLh8W2EeCx4wTAYBTJGBw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6qzc-0007wE-1G; Fri, 01 Nov 2024 08:43:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH v2 9/9] services: web: Fix race between nginx activation and anonip. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 01 Nov 2024 12:43:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74151@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173046495930434 (code B ref 74151); Fri, 01 Nov 2024 12:43:07 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:39 +0000 Received: from localhost ([127.0.0.1]:49231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qz8-0007un-Ib for submit@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:39 -0400 Received: from mail-pf1-f178.google.com ([209.85.210.178]:50571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6qz4-0007uG-9J for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 08:42:35 -0400 Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-71e5a62031aso1510637b3a.1 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 05:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730464888; x=1731069688; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KGe8VyZN2Ra66xrmhWqWpZAX95htDF0u7v2gQpwIFQo=; b=XFIdxqo0qSklID+PpydkkU7/5w9LYBmhoZYQ0oJWFaxN16VxANBPe49vDl0YU7YT3u HCsWa5KPY7Xj6h29QnLtYPC01fihyWXOvjtITi/Ujl4/f/Za/bYK2lx2QZ5UY1pUELjg b6iLmfMsVF3FIKt7f+dTOgP+lKT6tLivFJG1Jq0DBs0llqBKlJ3Ta8UvsM3pKYVGwkmt /hkJungIBczNfTKaYtPNge7hsUkcQgXXaI9htL//BHha12ct7xJq6JTyTtj/By0xxn4Y qaw90HK+4a/Rc3ER2avXU5ahaXcDLbPNLhQ3je0qCaHxVyGrqb5jIoPpvpxsdw34lH3i lcbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730464888; x=1731069688; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KGe8VyZN2Ra66xrmhWqWpZAX95htDF0u7v2gQpwIFQo=; b=TWn7U1oYgr2QwZEEduUB1W3WgkyJKIF2Jd0uGlqkWNzjqNd51CbbnUvDM5l3pFKgwI OaAL2REXS4Oi1S4VkOLOdi5QIWl2UGQT7wu4Ppw9hFYBv06xosijinT3N2ut/uebXkxS Mh7lJE4N6NnItmpdI78sZ+yZ/oKqkY2yHYeu5bIIviLowlpoj9kwVk9bMJIIUaQFhIny Kcu82yGqOMHVY3K8FGYkbBuDraThFL2mTCVcAIOlkJoxeuCaHR/lkg8cXOLD3sghCX8r Nmsmd1wsbzaXioC+hzbhe6YF0/70FROMDuVfiDAZ1B70p0Wq/itx23+vAV1QMG85JdzY fdVg== X-Gm-Message-State: AOJu0YzNZE83RA8oGtCkn6mzTvT96L5Zd8906Ld6/7eBlUW5E7HdIfnK fwNke0iEQfG0nRsVykM11mpIOdZwfLeTyB+RBnwDEcPXLQZkGbE0bsaHi9WI X-Google-Smtp-Source: AGHT+IF/jch5hLqJABLw+fRDEF6YIkJ4zKMWjTB7ItkhTzAFCjMrwBETi5z28485ygw4UnzrU4EdRA== X-Received: by 2002:a17:90b:1650:b0:2e2:b45f:53b4 with SMTP id 98e67ed59e1d1-2e94c50d447mr4565972a91.25.1730464887983; Fri, 01 Nov 2024 05:41:27 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fa0ea9bsm4819463a91.10.2024.11.01.05.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 05:41:27 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 21:39:29 +0900 Message-ID: <1d6c7e71f2a80a38f801965b7fd27f0b982016ec.1730464675.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/web.scm (anonip-shepherd-service): Recreate the input file when it's not a FIFO. Fixes: Change-Id: I8ba87f9fc48ecfd515e34bdee9e2949a2a559f9c --- New commit in v2 gnu/services/web.scm | 64 ++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index cf3515bf70..4cf7c68997 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1499,41 +1499,35 @@ (define (anonip-shepherd-service config) "Anonimyze the given log file location with anonip.") (start #~(lambda () - (define (spawn) - (fork+exec-command - (append - (list #$(file-append (anonip-configuration-anonip config) - "/bin/anonip") - (string-append "--input=" #$input) - (string-append "--output=" #$output)) - (if #$(anonip-configuration-debug? config) - '("--debug") (list)) - (if #$(anonip-configuration-skip-private? config) - '("--skip-private") (list)) - '#$(optional anonip-configuration-column "--column") - '#$(optional anonip-configuration-ipv4mask "--ipv4mask") - '#$(optional anonip-configuration-ipv6mask "--ipv6mask") - '#$(optional anonip-configuration-increment "--increment") - '#$(optional anonip-configuration-replacement "--replacement") - '#$(optional anonip-configuration-delimiter "--delimiter") - '#$(optional anonip-configuration-regex "--regex")) - ;; Run in a UTF-8 locale - #:environment-variables - (list (string-append "GUIX_LOCPATH=" - #$(libc-utf8-locales-for-target) - "/lib/locale") - "LC_ALL=en_US.utf8"))) - - (let ((stat (stat #$input #f))) - (cond ((not stat) - (mknod #$input 'fifo #o600 0) - (spawn)) - ((eq? 'fifo (stat:type stat)) - (spawn)) - (else - (format #t "'~a' is not a FIFO; bailing out~%" - #$input) - #f))))) + ;; Always attempt to recreate the named pipe, as activation scripts + ;; such as that of nginx may have created plain files in its place + ;; (see: https://issues.guix.gnu.org/59181). + (false-if-exception (delete-file #$input)) + (mknod #$input 'fifo #o600 0) + + (fork+exec-command + (append + (list #$(file-append (anonip-configuration-anonip config) + "/bin/anonip") + (string-append "--input=" #$input) + (string-append "--output=" #$output)) + (if #$(anonip-configuration-debug? config) + '("--debug") (list)) + (if #$(anonip-configuration-skip-private? config) + '("--skip-private") (list)) + '#$(optional anonip-configuration-column "--column") + '#$(optional anonip-configuration-ipv4mask "--ipv4mask") + '#$(optional anonip-configuration-ipv6mask "--ipv6mask") + '#$(optional anonip-configuration-increment "--increment") + '#$(optional anonip-configuration-replacement "--replacement") + '#$(optional anonip-configuration-delimiter "--delimiter") + '#$(optional anonip-configuration-regex "--regex")) + ;; Run in a UTF-8 locale + #:environment-variables + (list (string-append "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) + "/lib/locale") + "LC_ALL=en_US.utf8")))) (stop #~(make-kill-destructor)))))) (define anonip-service-type