From patchwork Fri Nov 1 07:11:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32769 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 F122327BBEA; Fri, 1 Nov 2024 07:14:59 +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 B07B927BBE2 for ; Fri, 1 Nov 2024 07:14:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6lrA-0004KV-TU; Fri, 01 Nov 2024 03:14: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 1t6lr9-0004KB-LW for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14:03 -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 1t6lr8-0001Bz-GA; Fri, 01 Nov 2024 03:14:02 -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=y/w6ydhSgh44KWOw8U4txYaDQB6/MHpRDs0ka4rHcQU=; b=qHOGlXVQ0VZShoTtTqrioSJ6cuusFWdpS9D7O6a33Su65GRAIICfH9esLe15rWauOkkfF5roqO0OzZbsjQPdeQ1fXdS5SqDkITtsj02HoINOXTXj1I9k5lfUvUOr4yoMG+q2AlQzKCCXTrqdM8VKK+1/GDONMkKt/xsNdaW+NrzfoZEF7YO6rDdqpzC2XM0EryjQd0FNKkYc0JtnWIKCwDKO45ImBe0QZPvu0MlE+Fx2q7x4aI3ItOPciJtg3lsR/VDd+hP3z02ouL9OfKw1zi2Oe0FALG4K+dB0O8b4Xpp0lR6bKWEHKaZLlMw2RvFxntnxK+JZqslFE/sZWMQMpw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6lr8-0005Kc-A7; Fri, 01 Nov 2024 03:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH 1/7] doc: Use @table @code for anonip-configuration doc. 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 07:14: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.173044519720388 (code B ref 74151); Fri, 01 Nov 2024 07:14:02 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:17 +0000 Received: from localhost ([127.0.0.1]:47328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqP-0005Ii-8O for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:17 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:61518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqN-0005IX-4q for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:15 -0400 Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-460b04e4b1cso10803151cf.2 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 00:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730445129; x=1731049929; 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=y/w6ydhSgh44KWOw8U4txYaDQB6/MHpRDs0ka4rHcQU=; b=VH8sd3ME3+4dN4Ikkh81ilp1MSTjPXEVYSHLC4VKoCNYccgKP+tzzd0qoIdqz2EmQE WTAedyLvLGxcBs/IRCsoT9/ZABSSQHF7jPfR2DAjyZczoQtqqERDUMxqe8ByQvUpxXcF KJXkoBcy4EPXcGqGUyp0O7oXczd94x9OFYS937E92MpY9T/zb5tTpm3UTI6/ngfcdYC4 0RY9P/ncR7lciI86SdlQ1UDIeWlZRK675LdfFmTeV9H21xN130ISWu59Ef0eu+/s79D6 DpP95t1lXg8PoMk8eljsteGJaPTXxZaf+4a2Ag62nChWRjOgll62uIpJe17l93iSsryA aEsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730445129; x=1731049929; 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=y/w6ydhSgh44KWOw8U4txYaDQB6/MHpRDs0ka4rHcQU=; b=A42XdUbMZyCejCGV1nyFZxjecMwgfFBW+AJ29ymbfLEJ2FnX7qyGruS7GBa8+mzkkS nxnlApU2K2p+fwrLD2newIceJIBjlF5Lf9uHEhTeuCvbxT4n2/heSL/U9/mHaKyRpbI6 ZDPeZLZg/tqvCXTZRY7FFL6GnlfeuBAIHscgQRPe2xQnCOUKQmsFO4hx+YtGzqyMsgYt 76CNTAWnD5dfWz+QI4D7Ku3/YvDtsvS2vbnciFrliZlnDQsVEHy6Kyqq1L1BCh2PJZCi Hes0BTbqjLqBrcehta+AeuH/eEX7eYBrAO8ZCak2UIknpxm8xrZRyULOa3jca51NRrwK NmUA== X-Gm-Message-State: AOJu0Yz3RKJv75B5kzTMYnyq9WFVbuxvxmYiskvv37zFK6+T/SQd8Bi3 Pt1u537fBzJQFwAcNaDH9LKyUYJ9X67bv9qnWe7YJwL11Nda/PhvpIVNo0Go X-Google-Smtp-Source: AGHT+IGjQW37R7wtzbWzx9/ATuH55ayIzL5kOurC8K/03mRM/G6/4LqG6IyPnmp+4HTUCIofho7N8A== X-Received: by 2002:ac8:5716:0:b0:460:8faf:c3a1 with SMTP id d75a77b69052e-4613c1a7bdamr360183521cf.37.1730445129079; Fri, 01 Nov 2024 00:12:09 -0700 (PDT) Received: from localhost.localdomain (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad1a0f59sm15646821cf.81.2024.11.01.00.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 00:12:07 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 16:11:37 +0900 Message-ID: <281a4773768a6c271ff464f473fdbc333a58c348.1730441684.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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(-) 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 07:11:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32763 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 BEB0127BBE2; Fri, 1 Nov 2024 07:14:33 +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 6FC8B27BBE9 for ; Fri, 1 Nov 2024 07:14:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6lrE-0004LC-4z; Fri, 01 Nov 2024 03:14: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 1t6lrA-0004KJ-Bn for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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 1t6lr9-0001C3-0u; Fri, 01 Nov 2024 03:14: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=ds70EhUrG7MRRNHjYJkfBAs/LICz5N3pcVQHb3nVlSBGPXBSbtGiSXl+dS9SUPU1Ma89hgrvQUxyoq14z0OggiPTb0rykkQCB3fyzoxH/J5QSCH27yciaYanWKJqq0onqY7lWDONSOqog1cg7foBw/XpBaujj3qsnxbynH417nED+PNWlZ6kF2rl7xZtUp10yFfwYdgNB7H3bCBNUt90DgupbmiimZ5GKT8Mt4Vvr37ZTJf65kNz9i/PKIYUDnS4nolVUMrvNVSMm6It8qhOGa8hlh/pYnwAOrLehrGb97XjC3PCHcaMlTXNw22wzjxzIjl0AnOP8Rqdmpsk8fXKjw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6lr8-0005Kk-Qk; Fri, 01 Nov 2024 03:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH 2/7] 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 07:14: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.173044520220402 (code B ref 74151); Fri, 01 Nov 2024 07:14:02 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:22 +0000 Received: from localhost ([127.0.0.1]:47331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqT-0005J0-Jk for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:21 -0400 Received: from mail-qt1-f170.google.com ([209.85.160.170]:61873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqR-0005IZ-Sq for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:20 -0400 Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-4609967ab7eso10812491cf.3 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 00:13:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730445134; x=1731049934; 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=NRcA7giOQoFVw9/K85wfYEN3lbPWTyv+YoOcEw0JDG4MiaG06fICZq1IZ5m4TRDa08 hW4sP3r9h5FMdV0/ZQ96pgz/L/cS0er3FdAKeSj095Sy+F1QAGSTaSmY7dSei28ygPYB hTVinHaLv1NPFk0SCSAieyw0wqujXF9//0JFWZy/LzoIfB2itaSaZQUmSlJIvDcnEbFY mGajvb8HvDHmsCD6ccSBFE9fXPBxO2R3GNgL0TKTLA0SiSiAnzT7BCqCK8VtI2e6hK24 Pf0prFyGhdoNqC9F4ZxTOFbq47VJIuyyBIOrfqo0p1dsxDFVmiVUYq5SyyLzxXqC2H05 T9Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730445134; x=1731049934; 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=VqdMau4ilc0RAV0s7o/p3jQ8+wi4ItlRr5O5lzl7bhVoQSNYyaKJouJjQhureamGuX wvaK9pPyxVNv+qG14w8r2A4ty42lT1agTLzLbz8N7xrZstKGJ9vdlbeC+1nlJvr+Zc7R 2spNFjqQcM5ute5Srg3f86FKrfjtWu/c4v7pLK2LSjHK+KOEoiVTN5Ag4XhqaPh/Gy+H K7dQKKLPIME6hShpUQFkM1xpGTSQ7mgYVkSoYuzW/ihNm2+pShTyGnH5APuaDulcpB9A alsSQ74CZuNNXY88BL5f652fWtp4FcrSmdHXmlZZEmJxtlFbwVABTRcirfM+hPFb88Dj ym1A== X-Gm-Message-State: AOJu0YzVFFbtzyT1bz8numbHE3EgywVzoUfuN5z51SMAHuc8I5ZBHF8C wz3HMaeh/2Dx6Ya4SpaSB8UCMpiHmnGpVSTb5xKaTEExKKIShPF5HCjEc4gt X-Google-Smtp-Source: AGHT+IFochRSRltEQUSgWPUE6ynNryQ/3XyREzqkKI9Dh/6FtN2TEhA4ohUwgKUCqvOJFWCn3gYn7Q== X-Received: by 2002:ac8:549:0:b0:461:43d4:fca3 with SMTP id d75a77b69052e-46143d4fd32mr241920171cf.24.1730445133986; Fri, 01 Nov 2024 00:12:13 -0700 (PDT) Received: from localhost.localdomain (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad1a0f59sm15646821cf.81.2024.11.01.00.12.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 00:12:12 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 16:11:38 +0900 Message-ID: <12708a075e13fc3acfb4f2685d561fd9ee481b87.1730441684.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 07:11:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32764 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 7959227BBEA; Fri, 1 Nov 2024 07:14:36 +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 3AD9327BBE2 for ; Fri, 1 Nov 2024 07:14:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6lrE-0004LF-Gf; Fri, 01 Nov 2024 03:14: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 1t6lrA-0004KU-R2 for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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 1t6lr9-0001C5-Gf for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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=vho1GXKG5MdQ6aDxN89R/rQCWg0PvzPZDsRpyLhjOwRFAUIxTkSBk4SVKO7a8fNiKUQMQChsNETwU3a9expZ5mMhg4E3XDe80Iq2Bed29QzMJJbCwedUY6HygVCPhDpdtLeHYgzFDnc+DIgGehSfMb4t0vcglM3KS+kBvmq5NRd2uiFbkGLvkm0obcnez4qcnUqtsyLuyImOtT81Z1kNIDuCro0q7iE3hpafzspfycCPwp8L2ltm5I2PvgYcyex7r8H2UW1G/dMnBMSadYEFdj7vq0towVvrmGW1AMZKoZsAwyLEU7PPapZZOxfqQZk9mpjMoNJz0U351ZlanLy6hw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6lr9-0005Ks-BC; Fri, 01 Nov 2024 03:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH 3/7] 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 07:14: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 X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173044520520418 (code B ref 74151); Fri, 01 Nov 2024 07:14:03 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:25 +0000 Received: from localhost ([127.0.0.1]:47334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqX-0005JG-11 for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:25 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:47446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqV-0005It-U4 for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:24 -0400 Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-4609d8874b1so12438321cf.3 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 00:13:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730445138; x=1731049938; 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=XVse0m+Yk9jFZXD45WVff9IHzdL40vpvCjPBQ+txLXM3nHphN2Q/QZHqnqcYrjsqGi u8wylKa1vsopwRGs35zdeWoq7TNvNsoyZbCtuacem1Rq9BrmaehsSyFgJoT+ok6T58em PNyr3NNIhvlZ/KpqJxbloKqP4LSckQvw90ER3zjZS2dEyZ1u/NL/z4Wb8yszw7I8s14F gK6y3Evyb/4d9Xq6mdGpu6n/Imyjrs1WOwmldbcsq5TDV7G0eUsFUDKpMPKC+LfL8tDy yj056VE1kjx5k6BR/tS79ot0fsvcrzKrMxRxTm53Oll3W+GrK1TJWiFNR6k9Bq/Ac7+/ WcSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730445138; x=1731049938; 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=LpzJO2m4udUdKETCzNFMZx9IS3Is620MWC39L4+ebVapin69sc56F1E8Vzay18Q7tf aqt9BNe2R5S4l+5tk8E//qo2WOy/vPqQstnJgoOKs7Id41KxAA2O5KcGJXqPy67ZA2JQ lmsLTKR49ljirz/RMD/78nfqB9aWTl39pqr+tLfQwrc8I22U5bvaCyA2aT/s24djmHiw dgeehtl1wXXHHKjICUTkH2CinnBrTHcPf0i2vqrXwaq9Qe7vkMZcK3DhmYmVfyeU+vfC ylP4N0aQSrH1PRmnYfmT9HtxL22KqVP56e5dGAz45v9Uul9cmEaQ5ErPX3rj/3a9QZkJ b70g== X-Gm-Message-State: AOJu0YyqxrWfr59PliTd3x7rRlkOroN+R4TZ35I0aOdTJAZzB+UvyeCs waOFZwQfXLem6eHW5e9U1RpdoEsmt26KYNerA0hjkiiVKVEEVmfeFbLmt0o+ X-Google-Smtp-Source: AGHT+IEdSguZkGgfmQfnrEX4G7Me+zx2QCVVGvBzBZ9J5MSTOqqTiyTHw25gqvgIk2SfWxnwOdk2jQ== X-Received: by 2002:a05:622a:1788:b0:460:cac8:bd1c with SMTP id d75a77b69052e-462ab2fcda4mr81939461cf.43.1730445138154; Fri, 01 Nov 2024 00:12:18 -0700 (PDT) Received: from localhost.localdomain (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad1a0f59sm15646821cf.81.2024.11.01.00.12.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 00:12:17 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 16:11:39 +0900 Message-ID: <397067fb8b2b50efef8092d77c93c04e0f28225a.1730441684.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 07:11:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32768 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 096C627BBE9; Fri, 1 Nov 2024 07:14:53 +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 58D9B27BBE2 for ; Fri, 1 Nov 2024 07:14:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6lrE-0004LQ-Vf; Fri, 01 Nov 2024 03:14: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 1t6lrA-0004KX-RQ for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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 1t6lrA-0001C8-1D for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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=SJpPkSjz1IfrJUr5PMcd6jRbpExBc/JgBjrrn0/JmYY=; b=DWXl/GYAqDIjPalTqvD2ToJVp9XW29r2ViC7Ap0tvfEULiQyllyE/KidOFgjT8UIwghn1q9ImCY4gQxjN4WBRO4e1hg5gi3tz+npDLTGxNe0K7W+ygaLZRa4Wvl68q5tqO+9YzbsBp11zLZb+WFiBZalUeB9FJ1EYAFgOSBJrEB/8dkeDZLeBiEo73Z572NEslk0goO3TomSsROuIardceZAQXAob3tk2DXz1KIu/DOuLfVQMHfz9bJHuSPRXQpaSSnFfMBgxJT17h/EDVhWO4xyYqetyCK3dzi0DZ4rzRk8rkOuq2tcw20JwhKJmQX9gOzRtG4Q0ffyzQs0hbgtAA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6lr9-0005L0-Ql; Fri, 01 Nov 2024 03:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH 4/7] 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 07:14: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 X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74151-submit@debbugs.gnu.org id=B74151.173044520920433 (code B ref 74151); Fri, 01 Nov 2024 07:14:03 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:29 +0000 Received: from localhost ([127.0.0.1]:47337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqb-0005JV-CP for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:29 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:48296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqa-0005J9-4M for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:28 -0400 Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-460af1a1154so10782141cf.0 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 00:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730445142; x=1731049942; 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=MiJb3Kre/HDluGZC6qFYphGmBiTWRr1f+eRKjm46iTStQSbtQEmSEwVVrpVMOHs6cQ HrreWSIdMkbxXdHSJ3zMb2UGRaCQ+8fiH2Sf8OY5XVJFuVgnf19Q/Wwr5VfBoGmT5KzC phgYZmFWFrpZ8pFngmfmvXuq8s9wsVFshNBwq66VZ3gSO6ZtSdzoLdBNS/12Wi45IZk6 3feDj3euhaqtAuSsjy80KlAkBKSMT+Ew/yN422iDU7d2zVt3e0Cgf9HN4/RWi7K57O69 CwCo40WONyr/tHd7crL0QITB8qlT+1IUfHEv5hyNIuuvc43+QuhOz7y42NQuIwTmGXmF 7oIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730445142; x=1731049942; 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=I5tl+OcnfQyF8RnbaCd9Bh+lWmW4PREHG8mIWr62syBM0WXe4cvOYhXe5OIDjmUssQ CNSrUGJBbQN3wVFj9XpIByQTdDCnKChmOqJcbnJHmsvUkUY0ASvtMg8RctkiPFZXXv+j ZddC+Ia0tMFiOoXR1bm+ONldmGmg8Fx0zroNypWa9sP5MfsXuObtsIYYEs3M3Cyt042F mkzdPFea3u3rr6NfmsarOyra2ElBwrCvlTMbJhuzKR+A3YXmULTrUloGC0GbZqVkKtSD 5twl57MMlkUJpLK7bCtJvvcwpIJo97Q2af/unbaqB5YhSlEbKa/t+buA1s+FTgu4IPh/ ++iQ== X-Gm-Message-State: AOJu0YyG6YDiy0t4URO0uddLnC0jf0uW337SUNEUHdpc0VeEDtgklFU0 D4OAtjkCJmAnwY1FqyYHGJDdZFMivcEYQh7TiXPgo5zhgzxNVAJwDvanyzlA X-Google-Smtp-Source: AGHT+IE5q6H9i7vcVaTfhqO6xVuD2EeiAWHO+9narmG0L+4t7/LzbKjVDm0iT4Jipx902xnPglODRQ== X-Received: by 2002:a05:622a:388:b0:461:161b:c178 with SMTP id d75a77b69052e-462ab258239mr89816371cf.13.1730445142273; Fri, 01 Nov 2024 00:12:22 -0700 (PDT) Received: from localhost.localdomain (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad1a0f59sm15646821cf.81.2024.11.01.00.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 00:12:21 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 16:11:40 +0900 Message-ID: <369fbb0b1eb904bf152356be15441aaed872c44a.1730441684.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 07:11:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32767 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 8E7E227BBEC; Fri, 1 Nov 2024 07:14:51 +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 599B127BBE9 for ; Fri, 1 Nov 2024 07:14:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6lrE-0004LE-GO; Fri, 01 Nov 2024 03:14: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 1t6lrA-0004KY-RT for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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 1t6lrA-0001CF-HB for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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=RrlXUF6m13LoK09KHFlvVTrCOKhX2H/GiKuTk7CoCgw=; b=mjLN7fBCO4GbeFawrpJiX6bXdkGyxL5VT/b7D4AOmPc+49p7bHoNjSwx4FAYsqmdurgKF4onBetrsr3w+lOEM3KRWyLGE3e4cttQi0APEoWYDNcd+nv/APVYy/yErjBb1Iv/JeL2+aAwwd/6AokiV+0LcpH49VNDgFJBnZJz7SarrqkntW879lDZ3Gbslkgp8fEYmyC6b/Py6eFTkynZLn+dqFV07UwzkpT0MnNqyDAC8b+r/cDZI7xTftXLTJycymTkGNceGk1ZReCUAy/vX9Fu2UPc/EsTX1FmCF/VBacN7vpKqXUU8fawhlzuD4V5hzcK5CFk8ofiJqHGwQM8KQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6lrA-0005L8-Br; Fri, 01 Nov 2024 03:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH 5/7] 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 07:14: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.173044521520448 (code B ref 74151); Fri, 01 Nov 2024 07:14:04 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:35 +0000 Received: from localhost ([127.0.0.1]:47341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqg-0005Jk-Pm for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:35 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:46451) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqf-0005JP-6Q for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:33 -0400 Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-460ace055d8so10937731cf.1 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 00:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730445147; x=1731049947; 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=gQtzUIkyVqWtY71PfDIMdqHfPivMlAXONRrDVwe6m8tjRU/p5i1A6JQeM3lbF9U1bf 0vBz20/5xQr8JWufyvmAZ/YAT8EeCbqy17BPYBcggiBV/1JYFAXfou9oOj1viZuU0Zfl 2jy+vYHTXO3rnGIqdXcp4mV5P6Nz8KsY8btUvauidH+uHe8J5AfSQy0ual8HytrDB26e 2189kBIrIpbnnmCf6EZAmLCfoZCILLJcocJrFDPGaFQqHefPS6rkKPFgaK6YSjkhoRc9 hGM8f6ZRKqICJ4ISMx1HdY6jvmoD5soO1oSAtMI1yLwcbVu8TgxZwd5SuET+mLHeCMVq pm+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730445147; x=1731049947; 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=VgY4E6AUDvGa3rY8BK8brKZE3Rbcfo+4iX38gqZXtaLeLFHAoM93amZrBHUs5HZDZt dTY1l5ePtOupjXCDAcyl5Lyp+aLvD6KxcN/87lwbFnvwarFhlW7+VwrEK5z1ZX7CbA7w 9LxLxvBglBf7V3Z3FCmjf7A4cg/UDbodHKM/f7z6LOjh/bjSfP5N2tPUgXhN/ltODXoc L9n0xOjcQpgSWB3dsPZ/rb6i97wdDL6i2eKM6T+kcn9vbQTeDqz0F9xGqhgXUsgC8XGq VPiEaD5GCzJpqQ7OPcb0Ndv9cDZNkWcO3PLRFl5rn7h1qNUzWimIDi32JJ+W+8bVqVu6 0qig== X-Gm-Message-State: AOJu0YzM+A3zoQ3aICPAzSXTeSXQmisTcnBbfF+/ZrXvJTSHDZtgsSt/ ZpY/2uGISMX9JUziZlTlCxNGNXspkd4VA+z2X8P4rrUS8YfkV+ViIwhosFxZ X-Google-Smtp-Source: AGHT+IGpvepEHepw2+uVsBcZvfa5MvngUGFIYthMtwIKD2p0ELFrdYY9Gx/7YT8oCxkW69OTnZjJ9Q== X-Received: by 2002:ac8:7f53:0:b0:458:3116:f06d with SMTP id d75a77b69052e-462ab271660mr69176771cf.22.1730445147339; Fri, 01 Nov 2024 00:12:27 -0700 (PDT) Received: from localhost.localdomain (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad1a0f59sm15646821cf.81.2024.11.01.00.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 00:12:25 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 16:11:41 +0900 Message-ID: <8c8215ff6140a98c412bb2df5faf19767635ea6b.1730441684.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 07:11:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32766 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 899ED27BBEB; Fri, 1 Nov 2024 07:14:45 +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 65F5627BBE2 for ; Fri, 1 Nov 2024 07:14:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6lrH-0004Lw-0Q; Fri, 01 Nov 2024 03:14:11 -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 1t6lrE-0004LH-Lt for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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 1t6lrB-0001CX-2N for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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=iukoIGWAYcPgxEkZ4B04z0S8ROC7zj3+LV3dN94ixVE=; b=pVPS9r3kpx18wsl8THbJ7T8SUpBplZ4BD3cn+cI2iJpllYujj7VLoOQVw01Sfnp+TS0VZkfLYERpWb93eX3daI0+iCV4b11UqCXcQ2wSsiuJIVvPGpQEkZ+ZTFQlD1QBRV/itTBC+CGPay/w4CN+W31JItQ8uaVZlqIwq6c0LcR0lXwqet560ftOhHKsKRxx4JORPUKXRq8P6bxZqOLa+AiRM6Gnd31ybFWrLO5va7hSUBL7G2Ftufowct/2rvfYpg4mqfKHjv9QaJMJTTcrsbq0gT4yGEz3HuSA5etG8qnDeDwYO6RgHYh/R0Dj0oi7ifnuquSxnEF/BOutlAKEZQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6lrA-0005LG-TD; Fri, 01 Nov 2024 03:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH 6/7] 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 07:14: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.173044522020463 (code B ref 74151); Fri, 01 Nov 2024 07:14:04 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:40 +0000 Received: from localhost ([127.0.0.1]:47344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqm-0005Jz-2Q for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:40 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:59876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqk-0005Je-M6 for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:38 -0400 Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-460b16d4534so10247671cf.3 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 00:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730445152; x=1731049952; 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=m54ZYFdpxzHNa1iIkdae3pLqRIXi1LUcqFCwG+9n1HH8CWKc5Cj2Xg6oXKVZrEDlJL zupx381XvFgLCeICaBCTyGfmWxwp1gLKZnkrapgUBvifmeZ8IeMPIUm9smoRIx4IRCnv 2BM02YUMdWkQd6d1J1ydKqIc501fM3QjJmLvw356We6khScyNABDs8iUM+IemaF/FIfr a5pLCsqeALJPJ1ja0hTKLIA4bS/eeQno1KXLBwDSFIfH13aA1Z0i9MINUl+dPCBbfMHx n9dN94LaAUecWxIzn15mpX6TTA2BzZYdxATIFMnta8lkKcWu+//KDqidq8rAJ4Y3jcl7 hmCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730445152; x=1731049952; 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=rAIai/PrRwPi9jX7HXx8jkx72PVL8ttGyzfoNNoiLiq+5TW1o50S+MTgOhZI3EDPGQ 38ZZhgUqHal6Ih/LTM7iNQTJ7IeJXcmQvrOUe/QXPkfxXDtrjb+00KIEfL10PBzkl73Z WKbMD+HuC0u0yCbRMItpxTDdZSW7WuqJQhciV9u/CfFplxE+gKyQEELSuy8kb+Gmf71I NxTOpFubHI2x1PLKjXDVJeIvNuVUmS6jurLv+CWmuOOch32dUC2K9AZJXHViK8fqXux5 GoeIgzqZTEQ9mge0pqewtbzc0oxt0RC31DRqzLHZ6lkp4RYIyuk6cpo8Hva6I8PRzwyS YzNw== X-Gm-Message-State: AOJu0YxMokfwe9nk844r7PZliuVwxFdC7sPMQnOTzEfbGAbJ+3uUuzOo mcGpmXS0OvM/nUfEnntPEKfFh5IYDtes+GTAgVJZl7VepEwI0ujwSlAxD7D0 X-Google-Smtp-Source: AGHT+IHQgVdFlAAJN8yLOaJeReOVv6AYu8/5AEDCCZbkXVhDjKRpFN3TjuaGr15zjG1ssIqG5WJzPA== X-Received: by 2002:a05:622a:1926:b0:461:6fd6:42ca with SMTP id d75a77b69052e-4616fd6467fmr149847171cf.36.1730445152443; Fri, 01 Nov 2024 00:12:32 -0700 (PDT) Received: from localhost.localdomain (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad1a0f59sm15646821cf.81.2024.11.01.00.12.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 00:12:31 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 16:11:42 +0900 Message-ID: <5d9173bd000c54075dc8b666dc0fcc8aa262f13a.1730441684.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 07:11:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 32765 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 2263B27BBEA; Fri, 1 Nov 2024 07:14:45 +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 7F0DD27BBE2 for ; Fri, 1 Nov 2024 07:14:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6lrJ-0004Mv-3v; Fri, 01 Nov 2024 03:14:13 -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 1t6lrE-0004LI-Ly for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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 1t6lrB-0001Ca-I4 for guix-patches@gnu.org; Fri, 01 Nov 2024 03:14: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=qFi3QBVToxtiUJVjnqz3ki5qf04RYuRlBJbYPwgyI0I=; b=JwJlsH207P5bJT0uk8LtrkNsS7WIxKzm7cyetmjP3HmwbjTgUg2w30dxoViFi/XXaWLY29Lr2hNWJjI731rsYxEtUO3HrrGiB4tY8A5pFJsM9ayFJEjGAunbvoB1+39mKdHqkhQe3Wv3VcXfdM+10lN5t0TEEtVHmTkowC6ASg65bpjBPFKarZrosNL/QtPBfypvNfOs9WTet6C4+v309wbzo6y1s90/cGA3FgM1u54+RSFzUaa1yOMHW6/tZR1X5qA/CrydA21sdZWwTJcsL8eyakLuX2nvPPU5nDWWy0yLxqNTfb6U+kM9eOyfL5bnc9ze8GRhE9jySDLamCvBnw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6lrB-0005LO-Cx; Fri, 01 Nov 2024 03:14:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74151] [PATCH 7/7] 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 07:14: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.173044522620475 (code B ref 74151); Fri, 01 Nov 2024 07:14:05 +0000 Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:46 +0000 Received: from localhost ([127.0.0.1]:47347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqr-0005KB-E4 for submit@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:45 -0400 Received: from mail-qt1-f181.google.com ([209.85.160.181]:47461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6lqp-0005Jt-Fb for 74151@debbugs.gnu.org; Fri, 01 Nov 2024 03:13:44 -0400 Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-4609d8874b1so12439311cf.3 for <74151@debbugs.gnu.org>; Fri, 01 Nov 2024 00:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730445158; x=1731049958; 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=qFi3QBVToxtiUJVjnqz3ki5qf04RYuRlBJbYPwgyI0I=; b=nKue4UhMBc90OopVtiehHPp7kXXIA6TdldjxQ6EG1m9H+oZVF852hMCAdjmnCksGWx poYWb9iaPUx8uLldcTDiFjppgdpP61ghHwCS4E50FICqSN7xnwZ45x4hoK7ZJTTQqi5P x1wBKqMb3eLLdNa6jo2F/HiDtLPNXHa96oP2gJbQCg2JtK5QJVDP/pacnWiU8BVFHEuR Tyljo+PeElvm2p1iOskUthjC/U/fRQSkDU2X/VgrBOpcZNBp3gnx9GWFoBBBqlJz+GUr 4JLnVTVkdm1FsTXssViwACv1E72lOSmaf/JiRg0PmFpjrZvUSdoq/5Qlw9Z/g0ITr3Rm H+dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730445158; x=1731049958; 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=qFi3QBVToxtiUJVjnqz3ki5qf04RYuRlBJbYPwgyI0I=; b=HXEtXo7I2eCe943dZO6BCi6nG6qJaUkWwpaWY2pLx0C1CPvbzoAiPVruQgM7LphPjs g6RgwIL27h9/yvm2bd8mKUTBkePcmxfG7/WeYjnQNxnSaHnQfZcRJ5KzJ+f5a6fqPWYi C481lCCRm6SkopfmyChJJovSmBifL9m45kFOJ9P9F/NXIgv4zN05zWaC88Kl6gmLvjyi Lbyeos/Y6z3tqBt4XPTsQeqRAqcrCtBXjOGVOLqKPOQqXplhUZxOdMNcQU6dK781sbh1 AsF7W0+MqDKorLR1lrdy7RH65GzYq2ptXmxZOH/d59zZjDS7HWRDX4dg8JIBj6YdJ14T G8hA== X-Gm-Message-State: AOJu0YxuGQ+UdV1ZVbOdfbmcbIjAr7IghN1uCiEngBQ7TZqFuCHKunCR tvslH7HI2JfCxTPXadvghOhv0IeDRhQaHFnluA5l1IpeQP/z1Mh0r7kqspZf X-Google-Smtp-Source: AGHT+IHpZMJcSVV6AQ1ebuMXyUMySqHvZsRDTYDTiEzbguvEQ+z+bDiu52WRPKU2z0o2pI+d0VBYYA== X-Received: by 2002:a05:622a:198a:b0:45f:8c1:41af with SMTP id d75a77b69052e-462ab2fc97fmr77878551cf.41.1730445157556; Fri, 01 Nov 2024 00:12:37 -0700 (PDT) Received: from localhost.localdomain (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-462ad1a0f59sm15646821cf.81.2024.11.01.00.12.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2024 00:12:36 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 1 Nov 2024 16:11:43 +0900 Message-ID: <7c762086c432d21da2c664d4ee26c051fb54a481.1730441684.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 5c50322cef..f7a5659dc5 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,118 @@ (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/http.access.log") + (output "/var/log/anonip/http.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/http.access.log)) + marionette)) + + (test-assert "service can be restarted" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (restart-service 'anonip-/var/log/anonip/http.access.log) + (wait-for-service 'anonip-/var/log/anonip/http.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/http.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/http.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/http.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