diff options
author | Christopher Baines <mail@cbaines.net> | 2024-12-15 22:09:36 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2024-12-16 09:20:40 +0000 |
commit | acb256d4583caa48e601c8cd0572ee4f269887fc (patch) | |
tree | 16b8bcafa8205c67f33df256f940fc11221f4303 /gnu/services | |
parent | f3f371a4d7614df93de919455273bd3b71aa7b5c (diff) | |
download | guix-acb256d4583caa48e601c8cd0572ee4f269887fc.tar.gz guix-acb256d4583caa48e601c8cd0572ee4f269887fc.zip |
services: guix-data-service: Support specifying configuration.
The database contains some tables that are effectively used for configuration.
This commit starts to expose these to the guix service, enabling the
configuration to be handled by the service.
* gnu/services/guix.scm (<guix-data-service-configuration>): Add
git-repositories and build-servers.
(guix-data-service-configuration-git-repositories,
guix-data-service-configuration-build-servers): New procedures.
(guix-data-service-shepherd-services): Add new shepherd service to setup the
database.
Change-Id: I519efd9157b60f18c7e80e3bdc92c0e3c5729334
Diffstat (limited to 'gnu/services')
-rw-r--r-- | gnu/services/guix.scm | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 6c58b3a292..7a399238ef 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -100,6 +100,8 @@ guix-data-service-host guix-data-service-getmail-idle-mailboxes guix-data-service-commits-getmail-retriever-configuration + guix-data-service-configuration-git-repositories + guix-data-service-configuration-build-servers guix-data-service-type @@ -556,7 +558,11 @@ (default '())) (extra-process-jobs-options guix-data-service-extra-process-jobs-options - (default '()))) + (default '())) + (git-repositories guix-data-service-configuration-git-repositories + (default #f)) + (build-servers guix-data-service-configuration-build-servers + (default #f))) (define (guix-data-service-profile-packages config) "Return the guix-data-service package, this will populate the @@ -566,7 +572,8 @@ ca-certificates.crt file in the system profile." (define (guix-data-service-shepherd-services config) (match-record config <guix-data-service-configuration> - (package user group port host extra-options extra-process-jobs-options) + (package user group port host extra-options extra-process-jobs-options + git-repositories build-servers) (list (shepherd-service (documentation "Guix Data Service web server") @@ -596,6 +603,41 @@ ca-certificates.crt file in the system profile." (stop #~(make-kill-destructor))) (shepherd-service + (documentation "Guix Data Service setup database") + (provision '(guix-data-service-setup-database)) + (requirement '(postgres)) + (one-shot? #t) + (start + (with-extensions (cons package + ;; This is a poorly constructed Guile load path, + ;; since it contains things that aren't Guile + ;; libraries, but it means that the Guile + ;; libraries needed for the Guix Data Service + ;; don't need to be individually specified here. + (append + (map second (package-inputs package)) + (map second (package-propagated-inputs package)))) + #~(lambda _ + (use-modules (guix-data-service database) + (guix-data-service model git-repository) + (guix-data-service model build-server)) + + (begin + ((@ (guix-data-service database) run-sqitch)) + + #$@(if git-repositories + #~(((@ (guix-data-service model git-repository) + specify-git-repositories) + '(#$@git-repositories))) + '()) + #$@(if build-servers + #~(((@ (guix-data-service model build-server) + specify-build-servers) + '(#$@build-servers))) + '()))))) + (auto-start? #t)) + + (shepherd-service (documentation "Guix Data Service process jobs") (provision '(guix-data-service-process-jobs)) (requirement '(postgres networking)) |