From patchwork Mon Nov 21 11:05:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 44748 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB2DE27BBEC; Mon, 21 Nov 2022 11:06:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 066C327BBE9 for ; Mon, 21 Nov 2022 11:06:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ox4cm-0005N5-KQ; Mon, 21 Nov 2022 06:06:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ox4ck-0005LD-VV for guix-patches@gnu.org; Mon, 21 Nov 2022 06:06:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ox4ck-00087G-MM for guix-patches@gnu.org; Mon, 21 Nov 2022 06:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ox4ck-0000ox-4R for guix-patches@gnu.org; Mon, 21 Nov 2022 06:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59385] [PATCH] website: Link to the new packages browser Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Nov 2022 11:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59385 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Luis Felipe Cc: 59385@debbugs.gnu.org Received: via spool by 59385-submit@debbugs.gnu.org id=B59385.16690287383121 (code B ref 59385); Mon, 21 Nov 2022 11:06:02 +0000 Received: (at 59385) by debbugs.gnu.org; 21 Nov 2022 11:05:38 +0000 Received: from localhost ([127.0.0.1]:45553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ox4cJ-0000oE-FI for submit@debbugs.gnu.org; Mon, 21 Nov 2022 06:05:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ox4cE-0000nt-5V for 59385@debbugs.gnu.org; Mon, 21 Nov 2022 06:05:34 -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 ) id 1ox4c7-0007rj-6E; Mon, 21 Nov 2022 06:05:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=+nkOlwF9PemK56SFGjU3nzEk4nrepblgCuRQvk1Zdto=; b=C84uFjJ/8jgRJDzRrNqz 6H6X1STBhgkP/mRKVlkH5R8gR2Y7ODoX6YpoEBLALgsWBidROCwvkOzrftHNq252hkHvPUSB14mcs bva+pmTmaHZvMh0sTGsFY2pXCpNovZk107GO7n123xFA8bCXw8txd32/JZG63U2IgDaiPPdWxIczb 9vECChTVBPXKWhswLlL79oEqmVxubv0DHCralrN7Ru6j7tAqPVo3reqamk9V935RcTLNdTJdSySrx RXWlnM4mRdPwQEDWOROkTMqkbfhE3maMmXVcWW350nFti0MYX7h2le8Aiyhw/Rqe+sKbR66eErOGi LAi0ejenN+MYww==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ox4c6-0000e7-Pd; Mon, 21 Nov 2022 06:05:22 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: Date: Mon, 21 Nov 2022 12:05:20 +0100 In-Reply-To: (Luis Felipe's message of "Sat, 19 Nov 2022 13:47:40 +0000") Message-ID: <87pmdglg9b.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, Luis Felipe skribis: > From ad0effaab60acdb7bd0e533bd544b49a4bee8a2b Mon Sep 17 00:00:00 2001 > From: Luis Felipe > Date: Sat, 19 Nov 2022 08:21:04 -0500 > Subject: [PATCH] website: Link to the new packages browser. > > Update all package-related links to point to the newly deployed browser > at https://packages.guix.gnu.org/. > > * website/apps/base/utils.scm (packages-url): New procedure. > * website/apps/base/data.scm (contact-media): Use packages-url. > * website/apps/base/templates/components.scm (navbar): Likewise. > * website/apps/base/templates/contribute.scm (contribute-t): Likewise. > * website/apps/base/templates/donate.scm (donate-t): Likewise. > * website/apps/base/templates/home.scm (home-t): Likewise. Awesome, pushed! While we’re at it, can we also disable individual package page generation? It takes a lot of time to build and uses quite a lot of space as well; I’m eager to see them go. :-) Maybe we can add a redirect from pages like this: If we’re serious about it, we can try to match the package/version in URLs like and redirect to the right one. Not sure if that’s worth the trouble though. Thanks! Ludo’. diff --git a/hydra/modules/sysadmin/nginx.scm b/hydra/modules/sysadmin/nginx.scm index 3c3456d..0a8b1a8 100644 --- a/hydra/modules/sysadmin/nginx.scm +++ b/hydra/modules/sysadmin/nginx.scm @@ -75,6 +75,13 @@ synonymous IETF language tags that should be mapped to the same $lang." (define guix.gnu.org-redirect-locations (list + (nginx-location-configuration + (uri "~ /packages/.*") + (body (list "return 301 https://packages.guix.gnu.org"))) + (nginx-location-configuration + (uri "~ /([^/]+)/packages/.*") + (body (list "return 301 https://packages.guix.gnu.org"))) + ;; Short URL for the installation script (redirect "/install.sh" "https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh") ;; What follows is a list of redirects for URLs that used to be