diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-09 21:45:32 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-09 21:45:32 +0100 |
commit | b3b5714fa72bf661003f27fbccba5697f5810115 (patch) | |
tree | c4eedb0b21200ba438cd1d0d67cd79e6b63926f7 /gnu/services/cuirass.scm | |
parent | b6f946f039afad6cbc7027d52685072f7fbb8d35 (diff) | |
parent | 51f30d4fdf197b1dad5ddb1405611fbaee55d1f2 (diff) | |
download | guix-b3b5714fa72bf661003f27fbccba5697f5810115.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/cuirass.scm')
-rw-r--r-- | gnu/services/cuirass.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 7bfb021161..0f4f0f9948 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -77,7 +77,9 @@ (one-shot? cuirass-configuration-one-shot? ;boolean (default #f)) (fallback? cuirass-configuration-fallback? ;boolean - (default #f))) + (default #f)) + (extra-options cuirass-configuration-extra-options + (default '()))) (define (cuirass-shepherd-service config) "Return a <shepherd-service> for the Cuirass service with CONFIG." @@ -95,7 +97,8 @@ (specs (cuirass-configuration-specifications config)) (use-substitutes? (cuirass-configuration-use-substitutes? config)) (one-shot? (cuirass-configuration-one-shot? config)) - (fallback? (cuirass-configuration-fallback? config))) + (fallback? (cuirass-configuration-fallback? config)) + (extra-options (cuirass-configuration-extra-options config))) (list (shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) @@ -110,7 +113,8 @@ "--interval" #$(number->string interval) #$@(if use-substitutes? '("--use-substitutes") '()) #$@(if one-shot? '("--one-shot") '()) - #$@(if fallback? '("--fallback") '())) + #$@(if fallback? '("--fallback") '()) + #$@extra-options) #:environment-variables (list "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt" @@ -137,7 +141,8 @@ "--listen" #$host "--interval" #$(number->string interval) #$@(if use-substitutes? '("--use-substitutes") '()) - #$@(if fallback? '("--fallback") '())) + #$@(if fallback? '("--fallback") '()) + #$@extra-options) #:user #$user #:group #$group |