From 2cd6831161700409a16e5affd9145d0d4f2a56fe Mon Sep 17 00:00:00 2001 From: Ahmad Draidi Date: Thu, 2 May 2024 05:37:47 +0400 Subject: services: cuirass: Use separate extra options for cuirass web process. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, "extra-options" is passed to both "cuirass register" and "cuirass web" processes. This makes it impractical since the extra parameters have to be intended for and supported by both processes. * gnu/services/cuirass.scm (): Add a web-extra-options field. (cuirass-shepherd-service): Replace extra-options with web-extra-options for cuirass web. * doc/guix.texi (Continuous Integration): Document the changes. Change-Id: Iba79c559ea8267aaf8f25248f3d18ed7b352cb60 Signed-off-by: Ludovic Courtès --- doc/guix.texi | 5 ++++- gnu/services/cuirass.scm | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 749d689ac1..fc5760d30d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -34494,7 +34494,10 @@ When substituting a pre-built binary fails, fall back to building packages locally. @item @code{extra-options} (default: @code{'()}) -Extra options to pass when running the Cuirass processes. +Extra options to pass when running the @code{cuirass register} process. + +@item @code{web-extra-options} (default: @code{'()}) +Extra options to pass when running the @code{cuirass web} process. @end table @end deftp diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index bcdbffa2f3..b09d5601d4 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -120,6 +120,8 @@ (fallback? cuirass-configuration-fallback? ;boolean (default #f)) (extra-options cuirass-configuration-extra-options + (default '())) + (web-extra-options cuirass-configuration-web-extra-options (default '()))) (define (cuirass-shepherd-service config) @@ -142,7 +144,8 @@ (use-substitutes? (cuirass-configuration-use-substitutes? config)) (one-shot? (cuirass-configuration-one-shot? config)) (fallback? (cuirass-configuration-fallback? config)) - (extra-options (cuirass-configuration-extra-options config))) + (extra-options (cuirass-configuration-extra-options config)) + (web-extra-options (cuirass-configuration-web-extra-options config))) `(,(shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) @@ -192,7 +195,7 @@ "--parameters=" parameters)) '()) - #$@extra-options) + #$@web-extra-options) #:user #$user #:group #$group -- cgit v1.2.3