branch master updated: hydra: nginx: Adjust location blocks for /themes move.

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new ef0e3bf  hydra: nginx: Adjust location blocks for /themes move.
ef0e3bf is described below

commit ef0e3bf584a66ac14ff230da54c7d25d0fdf0129
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Mar 21 16:15:30 2024 +0100

    hydra: nginx: Adjust location blocks for /themes move.
    
    This adapts to the file layout changes made in
    
<https://git.savannah.gnu.org/cgit/guix/guix-artwork.git/commit/?id=f916cbb234e159f4730425c82d436a542f9288a8>.
    
    * hydra/modules/sysadmin/nginx.scm (guix.gnu.org-other-locations):
    Adjust for /themes move.
---
 hydra/modules/sysadmin/nginx.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/hydra/modules/sysadmin/nginx.scm b/hydra/modules/sysadmin/nginx.scm
index 59d5856..e8b7897 100644
--- a/hydra/modules/sysadmin/nginx.scm
+++ b/hydra/modules/sysadmin/nginx.scm
@@ -667,18 +667,20 @@ synonymous IETF language tags that should be mapped to 
the same $lang."
    ;; Let browsers cache files under /static 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.
    (nginx-location-configuration
-    (uri "/static")
+    (uri "/static")                             ;partly superseded by /themes
     (body (list "expires 1d;"
                 "alias /srv/guix.gnu.org/static;")))
+   (nginx-location-configuration
+    (uri "/themes")
+    (body (list "expires 1d;"
+                "alias /srv/guix.gnu.org/themes;")))
 
    ;; These rules take precedence over the '.pdf' and '.html' rules below.
    (nginx-location-configuration