From: Florian Pelz <pelzflorian@pelzflorian.de>
To: 69783@debbugs.gnu.org
Cc: Florian Pelz <pelzflorian@pelzflorian.de>
Subject: [bug#69783] [PATCH] hydra: nginx: Adjust to website themes in guix-artwork.
Date: Sun, 17 Mar 2024 21:21:23 +0100 [thread overview]
Message-ID: <20240317202531.21599-2-pelzflorian@pelzflorian.de> (raw)
In-Reply-To: <9cac9566-3716-1079-1d53-215cb7fa547b@zoho.com>
* 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(-)
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 <ludo@gnu.org>
;; Copyright © 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;; Copyright © 2020 Christopher Baines <mail@cbaines.net>
-;; Copyright © 2020, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
+;; Copyright © 2020, 2021, 2024 Florian Pelz <pelzflorian@pelzflorian.de>
;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;; 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
base-commit: e16552ce47aca34dc8597787f1c3f19d7580eb9b
--
2.41.0
next prev parent reply other threads:[~2024-03-17 20:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 20:44 [bug#69783] [PATCH]: website: Convert old style sheets into a theme Luis Felipe via Guix-patches via
2024-03-14 16:56 ` pelzflorian (Florian Pelz)
2024-03-14 20:16 ` Luis Felipe via Guix-patches via
2024-03-15 10:19 ` pelzflorian (Florian Pelz)
2024-03-15 15:33 ` [bug#69783] [PATCH v2] " sirgazil--- via Guix-patches via
2024-03-15 22:51 ` pelzflorian (Florian Pelz)
2024-03-15 19:34 ` [bug#69783] [PATCH] doc: build: Update paths to style sheets sirgazil--- via Guix-patches via
2024-03-16 9:34 ` bug#69783: " Giovanni Biscuolo
2024-03-16 11:09 ` [bug#69783] " pelzflorian (Florian Pelz)
2024-03-16 13:52 ` Luis Felipe via Guix-patches via
2024-03-16 17:47 ` pelzflorian (Florian Pelz)
2024-03-17 10:51 ` Giovanni Biscuolo
2024-03-17 16:52 ` pelzflorian (Florian Pelz)
2024-03-17 17:57 ` pelzflorian (Florian Pelz)
2024-03-17 20:21 ` Florian Pelz [this message]
2024-03-24 18:19 ` [bug#69783] [PATCH v2 1/2] hydra: nginx: Redirect 1.4.0 manual resources due to themes move Florian Pelz
2024-03-30 14:28 ` Ludovic Courtès
2024-03-24 18:19 ` [bug#69783] [PATCH v2 2/2] hydra: nginx: Further adjust to website themes in guix-artwork Florian Pelz
2024-03-30 11:00 ` Ludovic Courtès
2024-03-31 10:07 ` bug#69783: " pelzflorian (Florian Pelz)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240317202531.21599-2-pelzflorian@pelzflorian.de \
--to=pelzflorian@pelzflorian.de \
--cc=69783@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).