02/02: berlin: Build and publish the cookbook.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 8897e7bc35cbcd0d6cf60c4a57063cd2dceb7bbe
Author: Ludovic Courtès <address@hidden>
Date:   Mon Oct 21 23:31:30 2019 +0200

    berlin: Build and publish the cookbook.
    
    * hydra/berlin.scm (services): Add 'static-web-site-service-type'
    instance for "/srv/guix-cookbook".
    * hydra/nginx/berlin.scm (guix.gnu.org-locations): Add "/cookbook" and
    "/cookbook/.*\.pdf".
---
 hydra/berlin.scm       | 14 ++++++++++++++
 hydra/nginx/berlin.scm |  6 ++++++
 2 files changed, 20 insertions(+)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 172c9cd..fddf597 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -255,6 +255,20 @@ fastcgi_param PHP_VALUE \"post_max_size = 16M
                        (environment-variables
                         '(("GUIX_WEB_SITE_URL" . "/")))))
 
+             ;; Cookbook for 'master'.
+             (service static-web-site-service-type
+                      (static-web-site-configuration
+                       (git-url "https://git.savannah.gnu.org/git/guix.git";)
+                       (directory "/srv/guix-cookbook")
+
+                       ;; XXX: Use a different cache directory (see above).
+                       (cache-directory "guix-cookbook-master")
+
+                       (build-file "doc/build.scm")
+                       (environment-variables
+                        '(("GUIX_MANUAL" . "guix-cookbook")
+                          ("GUIX_WEB_SITE_URL" . "/")))))
+
              ;; GWL web site.
              (service gwl-web-service-type)
 
diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index 72214f8..40a757b 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -434,6 +434,9 @@ PUBLISH-URL."
    (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
@@ -445,6 +448,9 @@ PUBLISH-URL."
     (uri "~ /manual/(.*\\.pdf)$")
     (body (list "alias /srv/guix-manual/$1;")))
    (nginx-location-configuration
+    (uri "~ /cookbook/(.*\\.pdf)$")
+    (body (list "alias /srv/guix-cookbook/$1;")))
+   (nginx-location-configuration
     (uri "~ \\.pdf$")                             ;*.pdf at the top level
     (body (list "root /srv/guix-pdfs;")))