From patchwork Sun Mar 24 18:19:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 62240 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 9D52627BBE2; Sun, 24 Mar 2024 18:21:41 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 04C7627BBEA for ; Sun, 24 Mar 2024 18:21:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roSTH-0004z3-Gq; Sun, 24 Mar 2024 14:21:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1roSTC-0004xt-QZ for guix-patches@gnu.org; Sun, 24 Mar 2024 14:21:23 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1roSTA-0003mA-Pv for guix-patches@gnu.org; Sun, 24 Mar 2024 14:21:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roSTq-0007NU-7U for guix-patches@gnu.org; Sun, 24 Mar 2024 14:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69783] [PATCH v2 1/2] hydra: nginx: Redirect 1.4.0 manual resources due to themes move. References: <9cac9566-3716-1079-1d53-215cb7fa547b@zoho.com> In-Reply-To: <9cac9566-3716-1079-1d53-215cb7fa547b@zoho.com> Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Mar 2024 18:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69783 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69783@debbugs.gnu.org Cc: guix-maintainers@gnu.org, Florian Pelz Received: via spool by 69783-submit@debbugs.gnu.org id=B69783.171130449828296 (code B ref 69783); Sun, 24 Mar 2024 18:22:02 +0000 Received: (at 69783) by debbugs.gnu.org; 24 Mar 2024 18:21:38 +0000 Received: from localhost ([127.0.0.1]:47399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roSTS-0007MK-5T for submit@debbugs.gnu.org; Sun, 24 Mar 2024 14:21:38 -0400 Received: from relay.yourmailgateway.de ([188.68.63.162]:59153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roSTO-0007M8-6M for 69783@debbugs.gnu.org; Sun, 24 Mar 2024 14:21:37 -0400 Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4V2kry6G8Gz3tk0; Sun, 24 Mar 2024 19:20:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1711304450; bh=PYkL2POGcaJttL6DYjfoq0bJ8mVtCnNGr4+1PWnpU4g=; h=From:To:Cc:Subject:Date:From; b=hAslc1+8axus/fbBLdQFXRV/7BudoNQlTxrPFXcMihHBFWUuCV4bDU52gtzjVLyP6 PiTeR9siFnYrgo4Ey+65dZIomNM0GmFjXrngaqQesZq2gpdMB5x+MxFbKQr5RQONfK eUyjSYilZlRvYS7T/a4WIwrfhowUTewoBWfqmsrWswmAcaZQ3kmXNAIysEsAOTEzUY aqUK7GDUAFts0Ga6PCSkZlkGU441jrM5oBdL0p+cPF25eMD/sWqMXs6vFT19RjD8o7 C0PGZo+sZZse3kyo31guFwCcXHqzV2HK8SMllHKUQcEmrtPYYvVL5vDFNbRhhtErIr g5mmlPvSFW39w== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4V2kry5XlTz3tgv; Sun, 24 Mar 2024 19:20:50 +0100 (CET) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4V2kry36h5z8sb8; Sun, 24 Mar 2024 19:20:50 +0100 (CET) Received: from florianrock64.fritz.box (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id 1935A82F36; Sun, 24 Mar 2024 19:20:44 +0100 (CET) From: Florian Pelz Date: Sun, 24 Mar 2024 19:19:49 +0100 Message-ID: <20240324182012.5026-1-pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 1935A82F36 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: KnSLdt695OGIOD+PLYg2Xdljc4MsXZmGEwB9PXO/+8CNE1xhqBa9+wRB 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 * hydra/modules/sysadmin/nginx.scm (guix.gnu.org-redirect-locations): Redirect /static to the new /themes location to fix the 1.4.0 manual. --- hydra/modules/sysadmin/nginx.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) base-commit: ef0e3bf584a66ac14ff230da54c7d25d0fdf0129 diff --git a/hydra/modules/sysadmin/nginx.scm b/hydra/modules/sysadmin/nginx.scm index e8b7897..e18c9b4 100644 --- a/hydra/modules/sysadmin/nginx.scm +++ b/hydra/modules/sysadmin/nginx.scm @@ -2,7 +2,7 @@ ;; Copyright © 2016-2024 Ludovic Courtès ;; Copyright © 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;; Copyright © 2020 Christopher Baines -;; Copyright © 2020, 2021 Florian Pelz +;; Copyright © 2020, 2021, 2024 Florian Pelz ;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;; Copyright © 2021 Mathieu Othacehe ;; Released under the GNU GPLv3 or any later version. @@ -317,6 +317,20 @@ synonymous IETF language tags that should be mapped to the same $lang." (redirect "/manual/en/html_node/Installing-GuixSD-in-a-VM.html" "Installing-Guix-in-a-VM.html") (redirect "/manual/en/html_node/Running-GuixSD-in-a-VM.html" "Running-Guix-in-a-VM.html") + ;; URLs used by the manual for Guix 1.4.0. + ;; XXX: Remove after the next release. + (redirect "/static/base/css/elements.css" "/themes/initial/css/elements.css") + (redirect "/static/base/css/common.css" "/themes/initial/css/common.css") + (redirect "/static/base/css/messages.css" "/themes/initial/css/messages.css") + (redirect "/static/base/css/navbar.css" "/themes/initial/css/navbar.css") + (redirect "/static/base/css/breadcrumbs.css" "/themes/initial/css/breadcrumbs.css") + (redirect "/static/base/css/buttons.css" "/themes/initial/css/buttons.css") + (redirect "/static/base/css/footer.css" "/themes/initial/css/footer.css") + (redirect "/static/base/css/page.css" "/themes/initial/css/page.css") + (redirect "/static/base/css/post.css" "/themes/initial/css/post.css") + (redirect "/static/base/css/manual.css" "/themes/initial/css/manual.css") + (redirect "/static/base/css/code.css" "/themes/initial/css/code.css") + (redirect "/static/base/img/language-picker.svg" "/themes/initial/img/language-picker.svg") ;; Old URLs not ending in a slash like https://guix.gnu.org/graphics. (redirect "/about" "/$lang/about/") (redirect "/blog" "/$lang/blog/")