summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-08-12 12:58:34 +0200
committerMathieu Othacehe <othacehe@gnu.org>2021-08-12 12:59:55 +0200
commitd128c6fd33f46ec4e2d0ef352d20a858c377bf6f (patch)
tree9933233fb5b0033651a4325038d82123768bd850
parent8b9a5641bc1b6acb62e0e0467ee03cefde2d1757 (diff)
services: cuirass: Add a no-publish argument.
* gnu/services/cuirass.scm (<cuirass-remote-server-configuration>): Add a no-publish? field. (cuirass-shepherd-service): Honor it. * doc/guix.texi (Cuirass remote building): Document it.
-rw-r--r--doc/guix.texi5
-rw-r--r--gnu/services/cuirass.scm9
2 files changed, 12 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 4eb5324b51b..ac6c11949f5 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -27889,6 +27889,11 @@ Use @var{cache} directory to cache build log files.
27889Once a substitute is successfully fetched, trigger substitute baking at 27889Once a substitute is successfully fetched, trigger substitute baking at
27890@var{trigger-url}. 27890@var{trigger-url}.
27891 27891
27892@item @code{no-publish} (default: @code{#f})
27893Do not start a publish server and ignore the @code{publish-port}
27894argument. This can be useful if there is already a standalone publish
27895server standing next to the remote server.
27896
27892@item @code{public-key} 27897@item @code{public-key}
27893@item @code{private-key} 27898@item @code{private-key}
27894Use the specific @var{file}s as the public/private key pair used to sign 27899Use the specific @var{file}s as the public/private key pair used to sign
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 99b137e05ea..f0df5a68249 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -72,6 +72,8 @@
72 (default "/var/log/cuirass-remote-server.log")) 72 (default "/var/log/cuirass-remote-server.log"))
73 (cache cuirass-remote-server-configuration-cache ;string 73 (cache cuirass-remote-server-configuration-cache ;string
74 (default "/var/cache/cuirass/remote/")) 74 (default "/var/cache/cuirass/remote/"))
75 (no-publish? cuirass-remote-server-configuration-no-publish? ;boolean
76 (default #f))
75 (trigger-url cuirass-remote-server-trigger-url ;string 77 (trigger-url cuirass-remote-server-trigger-url ;string
76 (default #f)) 78 (default #f))
77 (public-key cuirass-remote-server-configuration-public-key ;string 79 (public-key cuirass-remote-server-configuration-public-key ;string
@@ -191,8 +193,8 @@
191 (stop #~(make-kill-destructor))) 193 (stop #~(make-kill-destructor)))
192 ,@(if remote-server 194 ,@(if remote-server
193 (match-record remote-server <cuirass-remote-server-configuration> 195 (match-record remote-server <cuirass-remote-server-configuration>
194 (backend-port publish-port log-file cache trigger-url 196 (backend-port publish-port log-file cache no-publish?
195 public-key private-key) 197 trigger-url public-key private-key)
196 (list 198 (list
197 (shepherd-service 199 (shepherd-service
198 (documentation "Run Cuirass remote build server.") 200 (documentation "Run Cuirass remote build server.")
@@ -225,6 +227,9 @@
225 "--trigger-substitute-url=" 227 "--trigger-substitute-url="
226 trigger-url)) 228 trigger-url))
227 '()) 229 '())
230 #$@(if no-publish?
231 (list "--no-publish")
232 '())
228 #$@(if public-key 233 #$@(if public-key
229 (list 234 (list
230 (string-append "--public-key=" 235 (string-append "--public-key="