01/01: hydra: berlin: Update configuration to serve guix.gnu.org and manual.

[julien lepiller]

roptat pushed a commit to branch master
in repository maintenance.

commit 34e558e14e47f873ca4a68cc234a70980c178ed6
Author: Julien Lepiller <address@hidden>
Date:   Thu Jul 11 22:45:18 2019 +0200

    hydra: berlin: Update configuration to serve guix.gnu.org and manual.
    
    * berlin.scm: Add static-website services to generate guix.gnu.org and
    the html manual.
    * nginx/berlin.scm: Serve guix.gnu.org from a proper directory generated
    by the former services.
---
 hydra/berlin.scm       | 23 +++++++++++++++++++++--
 hydra/nginx/berlin.scm | 20 ++++++++++++++++++--
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 0d690f1..42e19a9 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -1,7 +1,8 @@
 ;; OS configuration for "berlin", the frontend of the compile farm
 ;; hosted at the MDC.
 
-(use-modules (gnu) (guix) (sysadmin services) (sysadmin people) (sysadmin dns))
+(use-modules (gnu) (guix) (sysadmin services) (sysadmin people) (sysadmin dns)
+             (sysadmin web))
 (use-service-modules base databases dns monitoring networking admin shepherd)
 (use-package-modules admin certs emacs linux monitoring
                      ssh tls vim package-management
@@ -24,7 +25,6 @@
 
 (include "nginx/berlin.scm")
 
-
 
 ;;;
 ;;; Operating system.
@@ -201,6 +201,25 @@ fastcgi_param PHP_VALUE \"post_max_size = 16M
 
              (service nginx-service-type %nginx-configuration)
 
+             ;; Runnning guix.gnu.org.
+
+             (service static-web-site-service-type
+                      (static-web-site-configuration
+                       (git-url
+                        
"https://git.savannah.gnu.org/git/guix/guix-artwork.git";)
+                       (directory "/srv/guix.gnu.org")
+                       (build-file "website/.guix.scm")))
+             
+             (service static-web-site-service-type
+                      (static-web-site-configuration
+                       (git-url "https://git.savannah.gnu.org/git/guix.git";)
+                       (git-ref '(branch . "version-1.0.1"))
+                       (directory "/srv/guix-manual")
+                       (build-file "doc/build.scm")
+                      (environment-variables
+                        '(("GUIX_MANUAL_VERSION" . "1.0.1")
+                           ("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 0f6a865..0e38d1d 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -459,7 +459,15 @@ PUBLISH-URL."
     (server-name '("guix.info"
                    "www.guix.info"
                    "guix.gnu.org"))
-    (root "/home/rekado/guix.info")
+    (root "/srv/guix.gnu.org")
+    (locations
+      (list
+        (nginx-location-configuration
+          (uri "/manual/")
+          (body (list "alias /srv/guix-manual")))
+       (nginx-location-configuration
+         (uri "~ ^.+\.pdf$")
+         (body (list "root /srv/guix-pdfs")))))
     (raw-content
      (list
       "access_log /var/log/nginx/guix-info.access.log;")))
@@ -549,7 +557,15 @@ PUBLISH-URL."
     (server-name '("guix.gnu.org"))
     (ssl-certificate (le "guix.gnu.org"))
     (ssl-certificate-key (le "guix.gnu.org" 'key))
-    (root "/home/rekado/guix.info")
+    (root "/srv/guix.gnu.org")
+    (locations
+      (list
+        (nginx-location-configuration
+          (uri "/manual/")
+          (body (list "alias /srv/guix-manual")))
+       (nginx-location-configuration
+         (uri "~ ^.+\.pdf$")
+         (body (list "root /srv/guix-pdfs")))))
     (raw-content
      (append
       %tls-settings