From patchwork Sun Mar 17 20:21:23 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: 61921 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 7B56027BBEC; Sun, 17 Mar 2024 20:27:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 3675027BBEB for ; Sun, 17 Mar 2024 20:27:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rlx6O-0004PR-58; Sun, 17 Mar 2024 16:27:28 -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 1rlx6K-0004NW-IM for guix-patches@gnu.org; Sun, 17 Mar 2024 16:27:25 -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 1rlx6K-0006I2-7L for guix-patches@gnu.org; Sun, 17 Mar 2024 16:27:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rlx6v-0006NU-TO for guix-patches@gnu.org; Sun, 17 Mar 2024 16:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69783] [PATCH] hydra: nginx: Adjust to website themes in guix-artwork. 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, 17 Mar 2024 20:28:01 +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: Florian Pelz Received: via spool by 69783-submit@debbugs.gnu.org id=B69783.171070725124445 (code B ref 69783); Sun, 17 Mar 2024 20:28:01 +0000 Received: (at 69783) by debbugs.gnu.org; 17 Mar 2024 20:27:31 +0000 Received: from localhost ([127.0.0.1]:39895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlx6Q-0006MD-O6 for submit@debbugs.gnu.org; Sun, 17 Mar 2024 16:27:31 -0400 Received: from relay.yourmailgateway.de ([188.68.63.162]:49055) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlx6L-0006Lt-TU for 69783@debbugs.gnu.org; Sun, 17 Mar 2024 16:27:29 -0400 Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4TyTzV5PzQz3xCm for <69783@debbugs.gnu.org>; Sun, 17 Mar 2024 21:26:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1710707206; bh=FS4vvmQcVEjSFBLHlRrsUU7rNfYQNKtmOneUSinMxAk=; h=From:To:Cc:Subject:Date:From; b=FG3QaIPcRF06+deTk0MjVhE4ML2YS5EDe88l7bO/vp4uAMfTo4uwL6XdO19T3q9CI CuMHcdQIrRCNI0JPG5mDwYaPgoRYOeWOCD1yuyhkSnTRePnWP+kyeotKAEFND3FYvH 8a4YKHwnVr9tMNdJq6va3obzR7UwWCAHThNaGnowWwibbFyGVvZmSt5bG5UJ/9PQK3 +Xqgz8tzbus9gwrLzyzRtkN8dge71685tPmVlx8+k+9xLPaJUx4SX/WgWPt/b83qhX rNfBSZwa0Yb9q8YopaM2dXZGGH3K7utRbCjM0ZcBY+g/qHz130ImuGjm4YBokouIFd pX+L6SwRUNkAA== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4TyTzV4gZfz3xCl for <69783@debbugs.gnu.org>; Sun, 17 Mar 2024 21:26:46 +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 4TyTzV2cRYz8svT for <69783@debbugs.gnu.org>; Sun, 17 Mar 2024 21:26:46 +0100 (CET) Received: from florianrock64.fritz.box (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id D92748321B; Sun, 17 Mar 2024 21:26:40 +0100 (CET) From: Florian Pelz Date: Sun, 17 Mar 2024 21:21:23 +0100 Message-ID: <20240317202531.21599-2-pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: D92748321B X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: AHKVq6OH07lgVQcDmqlI+DcJQe64gXD3LUhISpBvQ95IrfX8uxrYi/VK 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. (guix.gnu.org-other-locations): Adjust to fonts being in /themes now. Use /static cache settings for /themes as well. * hydra/nginx/berlin.scm: Use /static cache settings for /themes. --- hydra/modules/sysadmin/nginx.scm | 27 +++++++++++++++++++++++---- hydra/nginx/berlin.scm | 10 ++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) base-commit: e16552ce47aca34dc8597787f1c3f19d7580eb9b diff --git a/hydra/modules/sysadmin/nginx.scm b/hydra/modules/sysadmin/nginx.scm index 59d5856..14d8461 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/") @@ -664,14 +678,14 @@ synonymous IETF language tags that should be mapped to the same $lang." (uri "^~ /cuirass/releases") (body (list "alias /srv/cuirass-releases;"))) - ;; Let browsers cache files under /static for a while. + ;; Let browsers cache files under /themes for a while. (nginx-location-configuration - (uri "/static/base/fonts") + (uri "/themes/initial/fonts") (body (list "expires 30d;" ;fonts never change "gzip on;" "gzip_types *;" - "alias /srv/guix.gnu.org/static/base/fonts;"))) + "alias /srv/guix.gnu.org/themes/initial/fonts;"))) ;; XXX: This is really a hack to work around the fact that we can't have ;; 'If-Modified-Since' because timestamps are zeroed. @@ -680,6 +694,11 @@ synonymous IETF language tags that should be mapped to the same $lang." (body (list "expires 1d;" "alias /srv/guix.gnu.org/static;"))) + (nginx-location-configuration + (uri "/themes") ;like "/static" above + (body (list "expires 1d;" + "alias /srv/guix.gnu.org/themes;"))) + ;; These rules take precedence over the '.pdf' and '.html' rules below. (nginx-location-configuration (uri "~ /manual/devel(|/.*)$") diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm index 5ba15d1..2f8cd60 100644 --- a/hydra/nginx/berlin.scm +++ b/hydra/nginx/berlin.scm @@ -174,6 +174,16 @@ PUBLISH-URL." "proxy_cache_valid any 10m;" "proxy_ignore_client_abort on;"))) + (nginx-location-configuration + (uri "/themes") ;like "/static" above + (body + (list + "proxy_pass http://localhost:8081;" + "proxy_cache static;" + "proxy_cache_valid 200 2d;" + "proxy_cache_valid any 10m;" + "proxy_ignore_client_abort on;"))) + (nginx-location-configuration (uri "/download") ;Cuirass "build products" (body