This is an automated email from the git hooks/post-receive script.
nckx pushed a commit to branch master
in repository maintenance.
The following commit(s) were added to refs/heads/master by this push:
new ead77fe hydra: Fix ‘…/manual’-style URLs without a trailing ‘/’.
ead77fe is described below
commit ead77feb81338666d80c1b7e9ca2d4b90576ee9c
Author: Tobias Geerinckx-Rice <[email protected]>
AuthorDate: Sun Jun 12 02:00:00 2022 +0200
hydra: Fix ‘…/manual’-style URLs without a trailing ‘/’.
These are used in, e.g., Guix System's /etc/os-release and were
embarrassingly broken.
* hydra/modules/sysadmin/nginx.scm (guix.gnu.org-other-locations):
Handle the absence of a trailing ‘/’ in manual & cookbook URLs.
---
hydra/modules/sysadmin/nginx.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hydra/modules/sysadmin/nginx.scm b/hydra/modules/sysadmin/nginx.scm
index c582fac..1fa516e 100644
--- a/hydra/modules/sysadmin/nginx.scm
+++ b/hydra/modules/sysadmin/nginx.scm
@@ -667,17 +667,17 @@ synonymous IETF language tags that should be mapped to
the same $lang."
;; These rules take precedence over the '.pdf' and '.html' rules below.
(nginx-location-configuration
- (uri "~ /manual/devel/(.*)$")
+ (uri "~ /manual/devel(|/.*)$")
(body (list "expires 4h;"
- "alias /srv/guix-manual-devel/$1;")))
+ "alias /srv/guix-manual-devel$1;")))
(nginx-location-configuration
- (uri "~ /manual/(.*)$")
+ (uri "~ /manual(|/.*)$")
(body (list "expires 1d;"
- "alias /srv/guix-manual/$1;")))
+ "alias /srv/guix-manual$1;")))
(nginx-location-configuration
- (uri "~ /cookbook/(.*)$")
+ (uri "~ /cookbook(|/.*)$")
(body (list "expires 4h;"
- "alias /srv/guix-cookbook/$1;")))
+ "alias /srv/guix-cookbook$1;")))
(nginx-location-configuration
(uri "~ \\.pdf$") ;*.pdf at the top level
(body (list "root /srv/guix-pdfs;")))
