From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KDNuCaOgWmEl5wAAgWs5BA (envelope-from ) for ; Mon, 04 Oct 2021 08:35:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id kFEPBaOgWmGDQQAAB5/wlQ (envelope-from ) for ; Mon, 04 Oct 2021 06:35:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 915E229A15 for ; Mon, 4 Oct 2021 08:35:14 +0200 (CEST) Received: from localhost ([::1]:51108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXHZA-0003TR-Iq for larch@yhetil.org; Mon, 04 Oct 2021 02:35:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXHZ0-0003TJ-9b for bug-guix@gnu.org; Mon, 04 Oct 2021 02:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52115) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXHZ0-0007SS-1v for bug-guix@gnu.org; Mon, 04 Oct 2021 02:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mXHYz-0002lg-PH for bug-guix@gnu.org; Mon, 04 Oct 2021 02:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#51000: The Web manual situation is still needlessly confusing Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 04 Oct 2021 06:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51000 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Tobias Geerinckx-Rice Received: via spool by 51000-submit@debbugs.gnu.org id=B51000.163332927310601 (code B ref 51000); Mon, 04 Oct 2021 06:35:01 +0000 Received: (at 51000) by debbugs.gnu.org; 4 Oct 2021 06:34:33 +0000 Received: from localhost ([127.0.0.1]:35428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXHYW-0002kv-SJ for submit@debbugs.gnu.org; Mon, 04 Oct 2021 02:34:33 -0400 Received: from flashner.co.il ([178.62.234.194]:56422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXHYT-0002kg-RD for 51000@debbugs.gnu.org; Mon, 04 Oct 2021 02:34:31 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 2ADC440417; Mon, 4 Oct 2021 06:34:23 +0000 (UTC) Date: Mon, 4 Oct 2021 09:31:59 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Tobias Geerinckx-Rice , 51000@debbugs.gnu.org References: <87ilydycps.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="0CFEPyMU1OT3qNmv" Content-Disposition: inline In-Reply-To: <87ilydycps.fsf@nckx> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 51000@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633329314; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=rXG8bcA6IYeBE29cYJZRlxqa83aPMxGW80BsfeK8L6o=; b=nLm/1Ju1r8T73RjkKJrW51/q7wFX6UsYJ6LjN4OskqMDardcfAj0Wk2yE6GKWJOJZfGCaL 4YbbML6jtfwkAKYDZKm6gcorR+lcwMo/n2GU8hrRnp2Jyl7PCRPBUrG9QNAZEwNVYtq4V2 MUW/cPfat/wBHF1U8Rui4acfS/I2zcJ6z0z/MN0w9fZRVOyKQKyRBnqXPpTwOnod+MnPR/ Pb/NxnEwZJHxNxzGleRnZtwcLwAlYOsY0cQJcmgCYbCJ/zimYKYk/o1pqOpj/B0jfyoA7x 7U85qMyTPyJ8B4HsR9rQGnh3eWTpKDJpUqcmO0VjZYPto8Ac0ba9Xz0CSBsfIw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633329314; a=rsa-sha256; cv=none; b=Pm7FymB62ls77EJddseUwheBbGoThaWUxQxfqAULnpcDTAZBlz0mmftmKeWd3Ql2sfkw8i HsNMzv0cIWmv6Q6uZo4JknpRZpntPA/QbrEzWbbRuZtKYpYn6f+jE+I1mlcEktDBisPAnA kvM+I80Zp5K51rwHymN8HuVbVvSI6Qu61pbz+bIXuhRtEgkQ/rKFZpMtPkyWTkdaLDFXZR UujHTemw3EEwPbGgJ0rPwgCH7Uayq2tRsjwhBj4FRnwIA2MufxIjs/3C/YVH/WfUtuF5Cb g5ll7HtW2VkXYDn0hrSPdtgSdqB0mU0shW0fb+GqCMf8tZNzc27vtl/OUBDYJA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -4.41 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 915E229A15 X-Spam-Score: -4.41 X-Migadu-Scanner: scn1.migadu.com X-TUID: LyXeJeKp5C0/ --0CFEPyMU1OT3qNmv Content-Type: multipart/mixed; boundary="G6ltNMkZ2QX/BLU4" Content-Disposition: inline --G6ltNMkZ2QX/BLU4 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 04, 2021 at 12:12:55AM +0200, Tobias Geerinckx-Rice via Bug rep= orts for GNU Guix wrote: > Good evening Guix! >=20 > Nary a literal week goes by that someone doesn't post confusion about this > or that not being in =E2=80=98the manual=E2=80=99, where the manual turns= out to be > instead of the one actually > shipped with their Guix. >=20 > The current solution is pointing them to > and resetting the timer. >=20 > Instead: >=20 > - We should make the =E2=80= =98devel=E2=80=99 > version, and move the stable version to to a versioned URL like > . >=20 > - Both manuals should have a gorgeous CSS box at the very top clearly > explaining their nature. Here is an untested patch against guix-maintenance to change the manual locations. It doesn't take into account any changes needed in the website itself to add a pointer to the 1.3.0 manual. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --G6ltNMkZ2QX/BLU4 Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-hydra-Move-guix-manual-URLs.patch" Content-Transfer-Encoding: quoted-printable =46rom 5ae07d5d8db78d3f190a8780ba2eeaa5ce2c1be1 Mon Sep 17 00:00:00 2001 Message-Id: <5ae07d5d8db78d3f190a8780ba2eeaa5ce2c1be1.1633329044.git.efraim= @flashner.co.il> =46rom: Efraim Flashner Date: Mon, 4 Oct 2021 09:28:20 +0300 Subject: [PATCH] hydra: Move guix-manual URLs. This is likely to remove some ambiguity for which manual to use. * hydra/berlin.scm (operating-system)[services]: Adjust static-website-service-type services to change the locations of the generated guix manuals. * hydra/nginx/berlin.scm (guix.gnu.org-other-locations): Adjust nginx-location-configuration for the manual locations. --- hydra/berlin.scm | 7 ++++--- hydra/nginx/berlin.scm | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hydra/berlin.scm b/hydra/berlin.scm index 146173b..44324cf 100644 --- a/hydra/berlin.scm +++ b/hydra/berlin.scm @@ -300,7 +300,8 @@ Happy hacking!\n")) (static-web-site-configuration (git-url "https://git.savannah.gnu.org/git/guix.git= ") (git-ref '(branch . "version-1.3.0")) - (directory "/srv/guix-manual") + (directory "/srv/guix-manual-1.3.0") + (cache-directory "guix-manual-1.3.0") (build-file "doc/build.scm") (environment-variables '(("GUIX_MANUAL_VERSION" . "1.3.0") @@ -310,7 +311,7 @@ Happy hacking!\n")) (service static-web-site-service-type (static-web-site-configuration (git-url "https://git.savannah.gnu.org/git/guix.git= ") - (directory "/srv/guix-manual-devel") + (directory "/srv/guix-manual") =20 ;; XXX: Use a different cache directory to work aro= und ;; the fact that (guix git) would use a same-named @@ -318,7 +319,7 @@ Happy hacking!\n")) ;; above. Since both mcron jobs run at the same ti= me, ;; they would end up using one branch or the other,= in ;; a non-deterministic way. - (cache-directory "guix-master-manual") + (cache-directory "guix-manual") =20 (build-file "doc/build.scm") (environment-variables diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm index 44ff28e..14a94fe 100644 --- a/hydra/nginx/berlin.scm +++ b/hydra/nginx/berlin.scm @@ -768,14 +768,14 @@ PUBLISH-URL." "alias /srv/guix.gnu.org/static;"))) =20 ;; These rules take precedence over the '.pdf' and '.html' rules below. - (nginx-location-configuration - (uri "~ /manual/devel/(.*)$") - (body (list "expires 4h;" - "alias /srv/guix-manual-devel/$1;"))) (nginx-location-configuration (uri "~ /manual/(.*)$") - (body (list "expires 1d;" + (body (list "expires 4h;" "alias /srv/guix-manual/$1;"))) + (nginx-location-configuration + (uri "~ /manual/1.3.0/(.*)$") + (body (list "expires 1d;" + "alias /srv/guix-manual-1.3.0/$1;"))) (nginx-location-configuration (uri "~ /cookbook/(.*)$") (body (list "expires 4h;" base-commit: 3069d5e8c8b00162af1d6e7705c8d235f2e3b56a --=20 2.33.0 --G6ltNMkZ2QX/BLU4-- --0CFEPyMU1OT3qNmv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmFan98ACgkQQarn3Mo9 g1FWHQ/7BSr3r7g4nYE0ihSWgPLZAWHZDN1jWUvMkQjzmMR0UMrm2++9oRtv/6sa td19oK8hHxXoGVkVlshsGBmP6Oe0KLnvwOkNprMRh/lBspqt00F3t7g2cBjiitGX sV42yiBCpzUyBi5jaBSJcH6uRpPC9x+c74jPqouvsnrcm0TIL0zStAF15Re/y5gk M5vN5pryorSvfzW7WwOFV+xOoiRlZsqNI3AUuxrvCAf8ecTUqJYJbblMj9ZnRhz2 yqFEFSg63UPbpbRyoADxyF+yRrcc81S5CtURBRtgLtoKpB0OsAnstWrnTDsekmqC 4Ce2nBPyS5SfAr0YlLA9EL7gpibqs83BKH8g5Kif8in3TmmQqAx6pZjAbMjK0wCg UU/T8MLsf0D9zL2ll0YZlCbGhaX6/gsHZL4SztyJytRSSKNUbj60O1FSevK2a3iI +ZZ1aE7YRgIgHCOCAV+9rPkdJUn9jaQQzVQN3bgSy18/xWWZiG5KUZRYVIy3umaR Rrkl8nFPa2paStQIck8UhNvSX+RO58kYEruytS3JULsAZesqOmqYicOgOSOJ3oDP 2prWGGPBrjb9LK5haU+H4G+svK4tMBHqoP4DNS3gjoC2C75iGvZxFQyDz8SNEbrv XVUitay3kfC9AclPyLnXbmitt8Q5ilRaE4Jte75xU+2qUuw2Yxo= =o7iz -----END PGP SIGNATURE----- --0CFEPyMU1OT3qNmv--