diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-10 20:50:02 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-10 20:50:02 +0100 |
commit | 50b99c90c87642f664f9c9523a6e40fc8542ddcf (patch) | |
tree | 9fc8845e93ba913730e5fb92bbad158716d84e74 /gnu/services/guix.scm | |
parent | bda4b5e0453e4c8feda24306b4aa76ad5406eb7d (diff) | |
parent | 21656ffa3b6d78a610f0befced20cc9b4b3baab6 (diff) | |
download | guix-50b99c90c87642f664f9c9523a6e40fc8542ddcf.tar.gz guix-50b99c90c87642f664f9c9523a6e40fc8542ddcf.zip |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/guix.scm')
-rw-r--r-- | gnu/services/guix.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 0f0fad39b0..10a8581a62 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -68,7 +68,12 @@ (default #f)) (commits-getmail-retriever-configuration guix-data-service-commits-getmail-retriever-configuration - (default #f))) + (default #f)) + (extra-options guix-data-service-extra-options + (default '())) + (extra-process-jobs-options + guix-data-service-extra-process-jobs-options + (default '()))) (define (guix-data-service-profile-packages config) "Return the guix-data-service package, this will populate the @@ -78,7 +83,7 @@ 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) + (package user group port host extra-options extra-process-jobs-options) (list (shepherd-service (documentation "Guix Data Service web server") @@ -92,7 +97,8 @@ ca-certificates.crt file in the system profile." #$(string-append "--host=" host) ;; Perform any database migrations when the ;; service is started - "--update-database") + "--update-database" + #$@extra-options) #:user #$user #:group #$group @@ -117,7 +123,8 @@ ca-certificates.crt file in the system profile." (start #~(make-forkexec-constructor (list #$(file-append package - "/bin/guix-data-service-process-jobs")) + "/bin/guix-data-service-process-jobs") + #$@extra-process-jobs-options) #:user #$user #:group #$group #:environment-variables |