Maxim Cournoyer <maxim.cournoyer@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 24 Nov 2024 12:08:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Nov 24 07:08:25 2024
Received: from localhost ([127.0.0.1]:33131 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tFBPc-0008D3-UF
for submit <at> debbugs.gnu.org; Sun, 24 Nov 2024 07:08:25 -0500
Received: from mail-qv1-f41.google.com ([209.85.219.41]:45344)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tFBPa-0008Cv-Ij
for 74151 <at> debbugs.gnu.org; Sun, 24 Nov 2024 07:08:23 -0500
Received: by mail-qv1-f41.google.com with SMTP id
6a1803df08f44-6d41dbf6cfbso28245636d6.3
for <74151 <at> debbugs.gnu.org>; Sun, 24 Nov 2024 04:08:22 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1732450041; x=1733054841; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=2/XfLAhavwbc3h1VCPOVft+quTXXWjMx9VYPw4u8ueA=;
b=NtSKY1FY6xTIuTsuZHKgc6a+9xgjtn+84Aa6PRH5VK71A1+pLNLi8yJL55i1B0XQ+M
/uy0lTRqbuLEfRl1rEVUIHLqzdiWGaDw3Cb+o3VtMEMRTc5LLjBkyy12TenvY53brdg6
9FIQtoVpt3vMQsGOD7KLILrV3N/t+JAOksol5EZJOxhx0MQiRLsiXaZAZ0zHvRlZe2fZ
Aavs0rYnWwyvM1zRevlSSYzXEJZADTH9AxgELZ8b/vWcHD43z2B5Ft7HSOadfRBbZ6SN
Yq0aKcYFl5kQn/MEcpZzqmoS5rawNG8Ne0Exv5b82bBxUc/GMYjyp2iaIayXR0XLGv6r
us4A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1732450041; x=1733054841;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:x-gm-message-state:from
:to:cc:subject:date:message-id:reply-to;
bh=2/XfLAhavwbc3h1VCPOVft+quTXXWjMx9VYPw4u8ueA=;
b=uT5BrlLwH3xJWU51FTypirCJdDA2nJchXvTGpyHIBXGXIGWKdGgHYBUzqnNui+Zvva
TLyUGijIoP+eDcm2HvNvwszGO1znsFxLIv5P5LzzMU+hYNxmmsddTSOZtsSDRC+z116B
CqIxRm8AlpiIOOHUtJ7HkJrmD2UsB3Iz9Iyirha2tFqm0iRIy5KenH/YNgNUI9fAXMEw
QzXbRJ2lZOYb2Sz/jvUrRdwgw1pyXssrV777IEpdbXU2KTdj22tJvL7RwCa1/h6KURat
fV1COo8DQFyQuzx4kx2Xxg/20L8NKelq0r5Gz7xXYV89APF2B2GHS8Y0Y5gnvDXOhH2C
Gfrw==
X-Gm-Message-State: AOJu0Yy6dHSAHpCLufyMplYNJWmq/dmQqMZZbBpqaGvhnNtoI8JBLx8Y
X7B4xwAUr9U4K0dhSzMWolDlGISVgDYmiKblvdbRqfgAQHmJQjXAQmfh22QH
X-Gm-Gg: ASbGncsMfR3Z5thXVr1XnPKxRSYKn7BZE3LOPMfNJTcuX4l/UQ3zj00dnfD59KY+IWV
HFReHfxJKWMF7CsarG0W5Wl8KEawtLkuIb6KEU+5+//IOOthgBPOzTvUq7kUdwtycuF5TWvm7n7
sBPJ7vwkn1BwjetjDV+9+U2s9yFE9Br4BUftf7w+etJCowIjOau/eYNLFak5QLk0R6i3ZRduxep
teqve0ac5lMdiHPCyoSOAPirVf009F5pu8c5aiW/GPqiv6OdTq9UhBsE4tGROr2pQH5RTY=
X-Google-Smtp-Source: AGHT+IG264xnJ7f8rx1vroL/A/vsnCyAm+Ae/6vjvgbQIZ37e0ASlRy/Z1x1+LnHw/nuLxBUax/7kQ==
X-Received: by 2002:a05:6214:2243:b0:6d4:1425:6d2d with SMTP id
6a1803df08f44-6d451362fafmr189727876d6.43.1732450041514;
Sun, 24 Nov 2024 04:07:21 -0800 (PST)
Received: from terra (vps-6234970c.vps.ovh.ca. [51.222.13.224])
by smtp.gmail.com with ESMTPSA id
6a1803df08f44-6d451ab579csm30935056d6.61.2024.11.24.04.07.18
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 24 Nov 2024 04:07:20 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#74151] [PATCH 0/7] Add anonip system test.
In-Reply-To: <87zflu1cbg.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Wed, 20 Nov 2024 10:31:15 +0100")
References: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
<87zflu1cbg.fsf@HIDDEN>
Date: Sun, 24 Nov 2024 21:07:10 +0900
Message-ID: <87y118q1ht.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: 74151 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Ludovic,
Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
> Hi,
>
> Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis:
>
>> This was developed as part of investigating the source of bug #59181 ([b=
erlin]
>> web services fail to start on reboot due to anonip).
>>
>> There is no issue having anonip run and the system reboot (as should be
>> expected as /var/run is supposed to be cleared thus the named pipes shou=
ld be
>> recreated every boot). This points to a race with nginx that would "win"
>> creating its log files under /var/run/anonip/* before the anonip service=
does.
>>
>> It'll need further investigating in that direction.
>
> This is nice work, LGTM!
>
> This did not elucidate the cause of #59181, right?
It did! The cause was the activation snippet of nginx, which runs the
nginx check command, which creates every file involved to check if it
has sufficient permissions.
The files would then exist before anonip had a chance to create them.
The fix has already been merged, so a reboot following a recent
reconfigure on berlin should show all our services up and running.
I'll run the system tests again and push it this doesn't break any.
--=20
Thanks,
Maxim
guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.Received: (at 74151) by debbugs.gnu.org; 20 Nov 2024 09:33:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 20 04:33:35 2024 Received: from localhost ([127.0.0.1]:45257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tDh5a-0001qI-Ua for submit <at> debbugs.gnu.org; Wed, 20 Nov 2024 04:33:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tDh5Y-0001q2-M4 for 74151 <at> debbugs.gnu.org; Wed, 20 Nov 2024 04:33:33 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tDh3M-0002vb-W1; Wed, 20 Nov 2024 04:31:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=29nRWTZ9nijvHXAVmfmtoV/SbZ2+2NwxkgbWydf/UVM=; b=Ub5YzfC6X3zGilsExUXd ZlSfJEMw5QVj0WTblvm/Wx1PNqi3PkeQtwQbGzjAzjdpnRK3IO76PuYJEP++oy+N8gHyubeYrqdKr MiRWhFATKKdvyEfJI87d9Of9/tBesEa+lyI+SM480zQpYLEW8XUHNYa1u6du89XXN1wtyWNQVnF+2 1Qs0Vwg7adCxt03diF1F5N6gJoCOwvSRe8fE0dCo1+cP1UwBhbvr/0beTXzPccSm0p40oPt0SdhIG 5A/WRS2QUWHPHU8aoeDSbc0SDpGXbDxIzoXUvRS/kisqf7YUotG7G+205jHdFTcpm+mz/7DCkhfC2 mYGNtK+ouU4Eew==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#74151] [PATCH 0/7] Add anonip system test. In-Reply-To: <cover.1730441684.git.maxim.cournoyer@HIDDEN> (Maxim Cournoyer's message of "Fri, 1 Nov 2024 15:20:38 +0900") References: <cover.1730441684.git.maxim.cournoyer@HIDDEN> Date: Wed, 20 Nov 2024 10:31:15 +0100 Message-ID: <87zflu1cbg.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74151 Cc: 74151 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi, Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: > This was developed as part of investigating the source of bug #59181 ([be= rlin] > web services fail to start on reboot due to anonip). > > There is no issue having anonip run and the system reboot (as should be > expected as /var/run is supposed to be cleared thus the named pipes shoul= d be > recreated every boot). This points to a race with nginx that would "win" > creating its log files under /var/run/anonip/* before the anonip service = does. > > It'll need further investigating in that direction. This is nice work, LGTM! This did not elucidate the cause of #59181, right? Thanks, Ludo=E2=80=99.
guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 20 Nov 2024 09:31:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 20 04:31:44 2024
Received: from localhost ([127.0.0.1]:45252 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tDh3o-0001n8-Gk
for submit <at> debbugs.gnu.org; Wed, 20 Nov 2024 04:31:44 -0500
Received: from eggs.gnu.org ([209.51.188.92]:41182)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1tDh3m-0001mr-9I
for 74151 <at> debbugs.gnu.org; Wed, 20 Nov 2024 04:31:42 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1tDh1Z-0002QY-NG; Wed, 20 Nov 2024 04:29:25 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=gxXAuY+xDsVPLcqrynnvO/+3rMJ7/fLnZuvEX4yMs+w=; b=rMDloHVRTGhP3OACzeOu
1eIhex1JzuMqcrCDleXdua3Xq5W7hYSxDuEcsEt6CnmnvN8OoNE4FRfoQEmUlKRNx22tVtmmSFsqC
QIDLqyi2MoPMItbksq5n49wU2+M6i4YuEkIp5p6YC4bkLO773lNaFnLN0l0n64s+XlU3tjCU5DEv4
3+QzyfYE288PZoqQASe1F/B1BMtPEf0yv6zj+kg7VsYkcXey2Gmz6Pbp8O3treRjSlrjPJWPNnhZF
hmLNwCj7tih9E4gQeNk5RXjNj0N6DB6hn9CRAjm4Ta8YmSzF6nVxMuvBliKSgj2/rQdsQPMU4XIDi
47fPOlDo5UXKZg==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#74151] [PATCH v2 6/9] build: marionette: Make it possible
to reboot VM during tests.
In-Reply-To: <5d9173bd000c54075dc8b666dc0fcc8aa262f13a.1730464675.git.maxim.cournoyer@HIDDEN>
(Maxim Cournoyer's message of "Fri, 1 Nov 2024 21:39:26 +0900")
References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
<5d9173bd000c54075dc8b666dc0fcc8aa262f13a.1730464675.git.maxim.cournoyer@HIDDEN>
Date: Wed, 20 Nov 2024 10:29:20 +0100
Message-ID: <874j422qz3.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 74151
Cc: 74151 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi!
Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis:
> * gnu/build/marionette.scm (make-marionette): Add 'reconnect=3D1' socket
> parameter.
> * gnu/system/vm.scm (common-qemu-options): Remove '-no-reboot' option.
>
> Change-Id: I5e100543ddddba0aea3ebe4e2f5cb8b0261c0d73
[...]
> +++ b/gnu/system/vm.scm
> @@ -227,7 +227,6 @@ (define* (common-qemu-options image shared-fs
> '("-enable-kvm")
> '())
>=20=20
> - "-no-reboot"
I believe the reason we had =E2=80=98-no-reboot=E2=80=99 is because otherwi=
se QEMU would
restart the VM when we halt it (?). I=E2=80=99m not sure actually what the
exact scenario was.
Anyway, if you confirm that other system tests are unaffected by this
change, this is probably good.
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 08:42:39 2024
Received: from localhost ([127.0.0.1]:49231 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6qz8-0007un-Ib
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6qz4-0007uG-9J
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH v2 9/9] services: web: Fix race between nginx activation and
anonip.
Date: Fri, 1 Nov 2024 21:39:29 +0900
Message-ID: <1d6c7e71f2a80a38f801965b7fd27f0b982016ec.1730464675.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/services/web.scm (anonip-shepherd-service): Recreate the input file when
it's not a FIFO.
Fixes: <https://issues.guix.gnu.org/59181>
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
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 08:42:34 2024
Received: from localhost ([127.0.0.1]:49228 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6qz3-0007ub-Ht
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6qz0-0007u0-RJ
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH v2 8/9] tests: web: Add nginx+anonip test.
Date: Fri, 1 Nov 2024 21:39:28 +0900
Message-ID: <6099a6852bb8bdc693b273f3a7129767d8aabffc.1730464675.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
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) <extra-args>: 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
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 08:42:32 2024
Received: from localhost ([127.0.0.1]:49226 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6qz1-0007uU-Hx
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6qyy-0007tu-79
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH v2 7/9] tests: Add anonip system test.
Date: Fri, 1 Nov 2024 21:39:27 +0900
Message-ID: <f34e7fbf1b537ce923f9be089d9e5e86552f3e63.1730464675.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <clement@HIDDEN>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@HIDDEN>
;;; Copyright © 2018 Marius Bakke <mbakke@HIDDEN>
+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;;
;;; 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
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 08:42:26 2024
Received: from localhost ([127.0.0.1]:49222 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6qyv-0007u2-VO
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6qys-0007tL-4K
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH v2 5/9] services: herd: Export 'eval-there' in API.
Date: Fri, 1 Nov 2024 21:39:25 +0900
Message-ID: <8c8215ff6140a98c412bb2df5faf19767635ea6b.1730464675.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 08:42:25 2024
Received: from localhost ([127.0.0.1]:49220 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6qyv-0007tz-Ds
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6qyq-0007tU-37
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH v2 6/9] build: marionette: Make it possible to reboot VM
during tests.
Date: Fri, 1 Nov 2024 21:39:26 +0900
Message-ID: <5d9173bd000c54075dc8b666dc0fcc8aa262f13a.1730464675.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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"
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 08:42:21 2024
Received: from localhost ([127.0.0.1]:49217 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6qyr-0007tm-14
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6qyp-0007tA-9h
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH v2 4/9] tests: web: Have the retry-on-error throw on exhausted
attempts.
Date: Fri, 1 Nov 2024 21:39:24 +0900
Message-ID: <369fbb0b1eb904bf152356be15441aaed872c44a.1730464675.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
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)))))))))
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 08:42:20 2024
Received: from localhost ([127.0.0.1]:49211 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6qyn-0007tR-Cf
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6qyh-0007sr-Fi
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH v2 3/9] system/vm: Fix virtual-machine bug.
Date: Fri, 1 Nov 2024 21:39:23 +0900
Message-ID: <397067fb8b2b50efef8092d77c93c04e0f28225a.1730464675.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
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> %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 ...))))
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 08:42:17 2024
Received: from localhost ([127.0.0.1]:49209 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6qym-0007tJ-A0
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6qye-0007so-PV
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH v2 2/9] services: anonip: Add 'debug?' configuration field.
Date: Fri, 1 Nov 2024 21:39:22 +0900
Message-ID: <12708a075e13fc3acfb4f2685d561fd9ee481b87.1730464675.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
References: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/services/web.scm (<anonip-configuration>) [debug?]: New field.
(anonip-shepherd-service): Honor it.
* doc/guix.texi (Log Rotation) <anonip-configuration>: 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* <anonip-configuration>
(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
--
2.46.0
maxim.cournoyer@HIDDEN, ludo@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 12:42:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 08:42:16 2024
Received: from localhost ([127.0.0.1]:49207 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6qyl-0007tD-KT
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6qyc-0007sl-Dm
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH v2 1/9] doc: Use @table @code for anonip-configuration doc.
Date: Fri, 1 Nov 2024 21:39:21 +0900
Message-ID: <281a4773768a6c271ff464f473fdbc333a58c348.1730464675.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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
base-commit: 4009d1de954d694cb11af391d4113d29c5c1379d
--
2.46.0
maxim.cournoyer@HIDDEN, ludo@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 03:13:45 2024
Received: from localhost ([127.0.0.1]:47347 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6lqr-0005KB-E4
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6lqp-0005Jt-Fb
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH 7/7] tests: Add anonip system test.
Date: Fri, 1 Nov 2024 16:11:43 +0900
Message-ID: <7c762086c432d21da2c664d4ee26c051fb54a481.1730441684.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
References: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <clement@HIDDEN>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@HIDDEN>
;;; Copyright © 2018 Marius Bakke <mbakke@HIDDEN>
+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;;
;;; 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
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 03:13:40 2024
Received: from localhost ([127.0.0.1]:47344 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6lqm-0005Jz-2Q
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6lqk-0005Je-M6
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH 6/7] build: marionette: Make it possible to reboot VM during
tests.
Date: Fri, 1 Nov 2024 16:11:42 +0900
Message-ID: <5d9173bd000c54075dc8b666dc0fcc8aa262f13a.1730441684.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
References: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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"
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 03:13:35 2024
Received: from localhost ([127.0.0.1]:47341 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6lqg-0005Jk-Pm
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6lqf-0005JP-6Q
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH 5/7] services: herd: Export 'eval-there' in API.
Date: Fri, 1 Nov 2024 16:11:41 +0900
Message-ID: <8c8215ff6140a98c412bb2df5faf19767635ea6b.1730441684.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
References: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 03:13:29 2024
Received: from localhost ([127.0.0.1]:47337 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6lqb-0005JV-CP
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6lqa-0005J9-4M
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH 4/7] tests: web: Have the retry-on-error throw on exhausted
attempts.
Date: Fri, 1 Nov 2024 16:11:40 +0900
Message-ID: <369fbb0b1eb904bf152356be15441aaed872c44a.1730441684.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
References: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
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)))))))))
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 03:13:25 2024
Received: from localhost ([127.0.0.1]:47334 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6lqX-0005JG-11
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6lqV-0005It-U4
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH 3/7] system/vm: Fix virtual-machine bug.
Date: Fri, 1 Nov 2024 16:11:39 +0900
Message-ID: <397067fb8b2b50efef8092d77c93c04e0f28225a.1730441684.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
References: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
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> %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 ...))))
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 03:13:21 2024
Received: from localhost ([127.0.0.1]:47331 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6lqT-0005J0-Jk
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6lqR-0005IZ-Sq
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH 2/7] services: anonip: Add 'debug?' configuration field.
Date: Fri, 1 Nov 2024 16:11:38 +0900
Message-ID: <12708a075e13fc3acfb4f2685d561fd9ee481b87.1730441684.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
References: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/services/web.scm (<anonip-configuration>) [debug?]: New field.
(anonip-shepherd-service): Honor it.
* doc/guix.texi (Log Rotation) <anonip-configuration>: 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* <anonip-configuration>
(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
--
2.46.0
maxim.cournoyer@HIDDEN, ludo@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
Received: (at 74151) by debbugs.gnu.org; 1 Nov 2024 07:13:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 03:13:17 2024
Received: from localhost ([127.0.0.1]:47328 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t6lqP-0005Ii-8O
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1t6lqN-0005IX-4q
for 74151 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74151 <at> debbugs.gnu.org
Subject: [PATCH 1/7] doc: Use @table @code for anonip-configuration doc.
Date: Fri, 1 Nov 2024 16:11:37 +0900
Message-ID: <281a4773768a6c271ff464f473fdbc333a58c348.1730441684.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
References: <cover.1730441684.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74151
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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
--
2.46.0
maxim.cournoyer@HIDDEN, ludo@HIDDEN, guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 1 Nov 2024 06:20:57 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 01 02:20:57 2024 Received: from localhost ([127.0.0.1]:47090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t6l1l-0003a5-2u for submit <at> debbugs.gnu.org; Fri, 01 Nov 2024 02:20:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:44020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1t6l1j-0003Zy-Px for submit <at> debbugs.gnu.org; Fri, 01 Nov 2024 02:20:56 -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 <maxim.cournoyer@HIDDEN>) id 1t6l1j-0006Mw-Hl for guix-patches@HIDDEN; Fri, 01 Nov 2024 02:20:55 -0400 Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>) id 1t6l1i-00045e-3x for guix-patches@HIDDEN; Fri, 01 Nov 2024 02:20:55 -0400 Received: by mail-qv1-xf2c.google.com with SMTP id 6a1803df08f44-6cbf347dc66so9920066d6.3 for <guix-patches@HIDDEN>; Thu, 31 Oct 2024 23:20:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730442052; x=1731046852; darn=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=nuIGGHnOie3x96+k4YHSvemJx8JGfOrpObJW759k1Os=; b=A5uzPLWIQj9MTteR4G79hxBi7J90u7GFOmHpyUEPDWGkzcCtPXppiTvoKzzG7gwY2V PVIjm2QvUysOkAFjuBS2cJ+vnul8oqBNnxHKbkZLVao1GqN8nMNzgMXkKlrgwnGnXIL7 Yj6qCf3VT0JzDFlN8bUnLB4Iy//AsfASGiUMtdVkpvnI1FeoIcy1FZcz16acj4l25n1Z o4ua6oMgeY+5RV47v+uWrO/be9AxGngGF9gjx00jcv+OCQGcZGF+ZqPjwixg1RllzUM1 vtllDHwDQXDisEDAb0Ss57SX8v3G8nwG8Nc8aEJwmaDQ7L6uTBXEm5y3VrLP5T+Hd3K4 VcsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730442052; x=1731046852; 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=nuIGGHnOie3x96+k4YHSvemJx8JGfOrpObJW759k1Os=; b=usqVj86nniZsc4sU2hy2JLCFuffR90u0+0pqEILzATl5uWcwXnvcMMg5j9oZeIu3wW NU8OoRS+95+KeSSxtIwrFGEF7czn4eDOLzb4DYRRaN1tOsdxioshXhYNs87S05FkY7oE R/4lssLXOOKQb+nX5B27soBz1GOkbAb+tS5/ySFnrakFziWLjJhNUHSz8QzEb4MWC3Hy 6po9Vem9AjBxIagjesIeNxn2KS8MqrfIgrV5S+LStojxwvzdZ45LpuGQklolJF907qTe raJwJwfvyYOgHnCgJuDxnkqRSqIDjxfMzoQ+ftQaTH2uq8jtt+QEankXo4lo0TSr+3ze AAMQ== X-Gm-Message-State: AOJu0YxaTTCyutxw0SQzetLzrLbdKI5hbS2Cfo3b12cFPcPH+94lll+R xU7kAqLufrNfYOWBB9cOKQiGmG+umL233rtalvDVfDLc14gPdFgqSnc9oi8b X-Google-Smtp-Source: AGHT+IGKoCdJJdPUIlzkgLZaeLPhIjYgC3fIe9PAQQkLF9puQUItbiZ+/f59XOdcUeGMv6qeQM8C4g== X-Received: by 2002:a05:6214:54c1:b0:6cb:f039:85a0 with SMTP id 6a1803df08f44-6d35c189fa5mr34375746d6.40.1730442052266; Thu, 31 Oct 2024 23:20:52 -0700 (PDT) Received: from localhost.localdomain (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d35417a3c5sm15889666d6.130.2024.10.31.23.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2024 23:20:50 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/7] Add anonip system test. Date: Fri, 1 Nov 2024 15:20:38 +0900 Message-ID: <cover.1730441684.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f2c; envelope-from=maxim.cournoyer@HIDDEN; helo=mail-qv1-xf2c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) This was developed as part of investigating the source of bug #59181 ([berlin] web services fail to start on reboot due to anonip). There is no issue having anonip run and the system reboot (as should be expected as /var/run is supposed to be cleared thus the named pipes should be recreated every boot). This points to a race with nginx that would "win" creating its log files under /var/run/anonip/* before the anonip service does. It'll need further investigating in that direction. Maxim Cournoyer (7): doc: Use @table @code for anonip-configuration doc. services: anonip: Add 'debug?' configuration field. system/vm: Fix virtual-machine bug. tests: web: Have the retry-on-error throw on exhausted attempts. services: herd: Export 'eval-there' in API. build: marionette: Make it possible to reboot VM during tests. tests: Add anonip system test. doc/guix.texi | 21 ++++--- gnu/build/marionette.scm | 2 +- gnu/services/herd.scm | 1 + gnu/services/web.scm | 8 ++- gnu/system/vm.scm | 9 ++- gnu/tests/web.scm | 117 ++++++++++++++++++++++++++++++++++++++- 6 files changed, 142 insertions(+), 16 deletions(-) base-commit: 4009d1de954d694cb11af391d4113d29c5c1379d -- 2.46.0
Maxim Cournoyer <maxim.cournoyer@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#74151; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.