05/06: hydra: web: 'static-web-site-service-type' is extensible.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 25be6ec34dab1926d2618f64feadfed76d67621b
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Dec 22 12:24:10 2021 +0100

    hydra: web: 'static-web-site-service-type' is extensible.
    
    * hydra/modules/sysadmin/web.scm (static-web-site-service-type)[compose,
    extend, default-value]: New fields
---
 hydra/modules/sysadmin/web.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hydra/modules/sysadmin/web.scm b/hydra/modules/sysadmin/web.scm
index c5f994d..ff59a77 100644
--- a/hydra/modules/sysadmin/web.scm
+++ b/hydra/modules/sysadmin/web.scm
@@ -37,6 +37,7 @@
   #:use-module (gnu services shepherd)
   #:use-module (gnu services web)
   #:use-module (gnu system shadow)
+  #:use-module (srfi srfi-1)
   #:use-module (ice-9 match)
   #:export (build-program
 
@@ -212,7 +213,11 @@ that's built with Haunt or similar."
                 (system? #t)))))
 
 (define static-web-site-service-type
+  ;; Services of this type take a list of <static-web-site-configuration>
+  ;; records and can be extended with additional records.
   (service-type (name 'static-web-site)
+                (compose concatenate)
+                (extend append)
                 (extensions
                  ;; TODO: Extend nginx directly from here?
                  (list (service-extension mcron-service-type
@@ -223,7 +228,8 @@ that's built with Haunt or similar."
                                           static-web-site-activation)))
                 (description
                  "Update and publish a web site that is built from source
-taken from a Git repository.")))
+taken from a Git repository.")
+                (default-value '())))
 
 
 ;;;