branch master updated: hydra: bayfront: Build Guix websites.

[Mathieu Othacehe]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 8250a46  hydra: bayfront: Build Guix websites.
8250a46 is described below

commit 8250a46b2fa178d1cdd37986028d5a07e3db65ed
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Tue Dec 21 12:26:09 2021 +0100

    hydra: bayfront: Build Guix websites.
    
    * hydra/bayfront.scm: Build Guix websites.
---
 hydra/bayfront.scm | 66 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 172d025..ea7fc54 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -15,6 +15,8 @@
 (use-package-modules admin certs ci databases linux ssh tls vim
                      package-management web wget)
 
+(include "website.scm")
+
 (define %sysadmins
   ;; The sysadmins.
   (list (sysadmin (name "andreas")
@@ -898,43 +900,45 @@ access_log  /var/log/nginx/bordeaux.access.log;"))
               (non-derivation-substitute-urls
                (list "https://bordeaux.guix.gnu.org";))))
 
-    (modify-services %base-services
-      (guix-service-type
-       config => (guix-configuration
-                  (substitute-urls
-                   '("https://bordeaux.guix.gnu.org";))
-                  (authorized-keys
-                   (cons*
-                    (local-file "keys/guix/bayfront.guix.info-export.pub")
-                    ;; for substituting derivations
-                    (plain-file
-                     "data.guix.gnu.org.pub"
-                     "
+    (append
+     (website-services)
+     (modify-services %base-services
+       (guix-service-type
+        config => (guix-configuration
+                   (substitute-urls
+                    '("https://bordeaux.guix.gnu.org";))
+                   (authorized-keys
+                    (cons*
+                     (local-file "keys/guix/bayfront.guix.info-export.pub")
+                     ;; for substituting derivations
+                     (plain-file
+                      "data.guix.gnu.org.pub"
+                      "
 (public-key
  (ecc
   (curve Ed25519)
   (q #1EEE5340C3AAD6E062A1395A88A86FC75982E8BC7DCBAE171858EEAAB14AAB77#)
   )
  )")
-                    %build-node-keys))
-
-                  (max-silent-time (* 12 3600))
-                  (timeout (* 48 3600))
-
-                  ;; be friendly to 'guix publish' users
-                  (log-compression 'gzip)
-
-                  (build-accounts 64)
-                  (extra-options
-                   (list "--max-jobs" "1" "--cores" "16"))))
-      (login-service-type
-       config => (login-configuration
-                  (inherit config)
-                  (motd %motd)))
-      (openssh-service-type
-       config => (openssh-configuration
-                  (inherit config)
-                  (password-authentication? #f)))))))
+                     %build-node-keys))
+
+                   (max-silent-time (* 12 3600))
+                   (timeout (* 48 3600))
+
+                   ;; be friendly to 'guix publish' users
+                   (log-compression 'gzip)
+
+                   (build-accounts 64)
+                   (extra-options
+                    (list "--max-jobs" "1" "--cores" "16"))))
+       (login-service-type
+        config => (login-configuration
+                   (inherit config)
+                   (motd %motd)))
+       (openssh-service-type
+        config => (openssh-configuration
+                   (inherit config)
+                   (password-authentication? #f))))))))
 
 ;; Local Variables:
 ;; eval: (put 'modify-services 'scheme-indent-function 1)