diff mbox series

[bug#70285,1/3] services: cuirass: Use separate extra options for cuirass web process.

Message ID ececea8f2ef40baea66330e41638c9c44b4cef9b.1712576504.git.a.r.draidi@redscript.org
State New
Headers show
Series Cuirass service config options work | expand

Commit Message

Ahmad Draidi April 8, 2024, 5:54 p.m. UTC 
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 (<cuirass-configuration>): 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
---
 doc/guix.texi            | 5 ++++-
 gnu/services/cuirass.scm | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/doc/guix.texi b/doc/guix.texi
index 5827e0de14..77e17cb69c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -34406,7 +34406,10 @@  Continuous Integration
 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 @@  (define-record-type* <cuirass-configuration>
   (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 @@  (define (cuirass-shepherd-service config)
         (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 @@  (define (cuirass-shepherd-service config)
                                       "--parameters="
                                       parameters))
                                '())
-                        #$@extra-options)
+                        #$@web-extra-options)
 
                   #:user #$user
                   #:group #$group