02/03: berlin: Publish guix.gnu.org/manual/devel.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 30da34955f18c9d870ba4d0a945c3791766b28b3
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 17 22:23:14 2019 +0200

    berlin: Publish guix.gnu.org/manual/devel.
    
    * hydra/berlin.scm (services): Add 'static-web-site-service-type'
    instance for "/srv/guix-manual-devel".
    * hydra/nginx/berlin.scm (guix.gnu.org-locations): Add /manual/devel.
---
 hydra/berlin.scm       | 12 +++++++++++-
 hydra/nginx/berlin.scm |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 42e19a9..cf5cb3c 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -209,7 +209,8 @@ fastcgi_param PHP_VALUE \"post_max_size = 16M
                         
"https://git.savannah.gnu.org/git/guix/guix-artwork.git";)
                        (directory "/srv/guix.gnu.org")
                        (build-file "website/.guix.scm")))
-             
+
+             ;; Manual for the latest stable release.
              (service static-web-site-service-type
                       (static-web-site-configuration
                        (git-url "https://git.savannah.gnu.org/git/guix.git";)
@@ -220,6 +221,15 @@ fastcgi_param PHP_VALUE \"post_max_size = 16M
                         '(("GUIX_MANUAL_VERSION" . "1.0.1")
                            ("GUIX_WEB_SITE_URL" . "/")))))
 
+             ;; Manual 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-manual-devel")
+                       (build-file "doc/build.scm")
+                      (environment-variables
+                        '(("GUIX_WEB_SITE_URL" . "/")))))
+
              (frontend-services %sysadmins
                                 #:systems '("x86_64-linux" "i686-linux"
                                             "aarch64-linux")
diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index a8ef9bf..45eefc2 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -431,6 +431,9 @@ PUBLISH-URL."
              "Running-Guix-in-a-VM.html")
 
    (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