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)
downloadguix-patches-d128c6fd33f46ec4e2d0ef352d20a858c377bf6f.tar
guix-patches-d128c6fd33f46ec4e2d0ef352d20a858c377bf6f.tar.gz
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 4eb5324b51..ac6c11949f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -27889,6 +27889,11 @@ Use @var{cache} directory to cache build log files.
Once a substitute is successfully fetched, trigger substitute baking at
@var{trigger-url}.
+@item @code{no-publish} (default: @code{#f})
+Do not start a publish server and ignore the @code{publish-port}
+argument. This can be useful if there is already a standalone publish
+server standing next to the remote server.
+
@item @code{public-key}
@item @code{private-key}
Use 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 99b137e05e..f0df5a6824 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -72,6 +72,8 @@
(default "/var/log/cuirass-remote-server.log"))
(cache cuirass-remote-server-configuration-cache ;string
(default "/var/cache/cuirass/remote/"))
+ (no-publish? cuirass-remote-server-configuration-no-publish? ;boolean
+ (default #f))
(trigger-url cuirass-remote-server-trigger-url ;string
(default #f))
(public-key cuirass-remote-server-configuration-public-key ;string
@@ -191,8 +193,8 @@
(stop #~(make-kill-destructor)))
,@(if remote-server
(match-record remote-server <cuirass-remote-server-configuration>
- (backend-port publish-port log-file cache trigger-url
- public-key private-key)
+ (backend-port publish-port log-file cache no-publish?
+ trigger-url public-key private-key)
(list
(shepherd-service
(documentation "Run Cuirass remote build server.")
@@ -225,6 +227,9 @@
"--trigger-substitute-url="
trigger-url))
'())
+ #$@(if no-publish?
+ (list "--no-publish")
+ '())
#$@(if public-key
(list
(string-append "--public-key="