branch master updated: nginx: berlin: Fix locations for /manual and /cookbook.

[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 7260c58  nginx: berlin: Fix locations for /manual and /cookbook.
7260c58 is described below

commit 7260c58cafdfae31a28bc19990e0fa655e95ab14
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Jul 26 23:01:04 2020 +0200

    nginx: berlin: Fix locations for /manual and /cookbook.
    
    Fixes a regression introduced in commit
    c2d817d22b8d471d62015d42928486a589367322.
    
    * hydra/nginx/berlin.scm (guix.gnu.org-locations): Make sure /manual and
    /cookbook locations take precedence of the '.html' rule.  Before that,
    files for /manual would be searched for in /srv/guix.gnu.org.
---
 hydra/nginx/berlin.scm | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index 467acd8..951a865 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -699,27 +699,16 @@ PUBLISH-URL."
    (nginx-location-configuration
     (uri "/guix-videos")
     (body (list "alias /srv/videos;")))
-   (nginx-location-configuration
-    (uri "/manual/devel")
-    (body (list "alias /srv/guix-manual-devel;")))
-   (nginx-location-configuration
-    (uri "/manual")
-    (body (list "alias /srv/guix-manual;")))
-   (nginx-location-configuration
-    (uri "/cookbook")
-    (body (list "alias /srv/guix-cookbook;")))
 
-   ;; We want a regexp to match *.pdf at the top level, but we also want
-   ;; /manual/*.pdf to go to a difference place; the latter needs to take
-   ;; precedence over the former, hence these location blocks.
+   ;; These rules take precedence over the '.pdf' and '.html' rules below.
    (nginx-location-configuration
-    (uri "~ /manual/devel/(.*\\.pdf)$")
+    (uri "~ /manual/devel/(.*)$")
     (body (list "alias /srv/guix-manual-devel/$1;")))
    (nginx-location-configuration
-    (uri "~ /manual/(.*\\.pdf)$")
+    (uri "~ /manual/(.*)$")
     (body (list "alias /srv/guix-manual/$1;")))
    (nginx-location-configuration
-    (uri "~ /cookbook/(.*\\.pdf)$")
+    (uri "~ /cookbook/(.*)$")
     (body (list "alias /srv/guix-cookbook/$1;")))
    (nginx-location-configuration
     (uri "~ \\.pdf$")                             ;*.pdf at the top level