summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-08-13 13:44:06 +0200
committerMathieu Othacehe <othacehe@gnu.org>2021-08-13 13:46:21 +0200
commitcfd2442488971420289a12d5ca8f07816e1149bf (patch)
treecafd974d30d9d602b9ff6faaeb088e28f1e6820a
parent2caf9eafb6f4703d8f1af42123093f4a7f7a32ce (diff)
downloadguix-patches-cfd2442488971420289a12d5ca8f07816e1149bf.tar
guix-patches-cfd2442488971420289a12d5ca8f07816e1149bf.tar.gz
services: cuirass: Reverse the no-publish logic.
This is a follow-up of d128c6fd33f46ec4e2d0ef352d20a858c377bf6f. * gnu/services/cuirass.scm (<cuirass-remote-server-configuration>) [no-publish?]: Rename it to ... [publish?]: ... this new field. (cuirass-shepherd-service): Adapt it. * doc/guix.texi (Cuirass remote building): Document it.
-rw-r--r--doc/guix.texi8
-rw-r--r--gnu/services/cuirass.scm12
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 78c1c09858..6ba52623c0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -27889,10 +27889,10 @@ 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{publish?} (default: @code{#t})
+If set to false, 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}
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 34564b3894..83e63fe79c 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -73,8 +73,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))
+ (publish? cuirass-remote-server-configuration-publish? ;boolean
+ (default #t))
(trigger-url cuirass-remote-server-trigger-url ;string
(default #f))
(public-key cuirass-remote-server-configuration-public-key ;string
@@ -194,7 +194,7 @@
(stop #~(make-kill-destructor)))
,@(if remote-server
(match-record remote-server <cuirass-remote-server-configuration>
- (backend-port publish-port log-file cache no-publish?
+ (backend-port publish-port log-file cache publish?
trigger-url public-key private-key)
(list
(shepherd-service
@@ -228,9 +228,9 @@
"--trigger-substitute-url="
trigger-url))
'())
- #$@(if no-publish?
- (list "--no-publish")
- '())
+ #$@(if publish?
+ '()
+ (list "--no-publish"))
#$@(if public-key
(list
(string-append "--public-key="