From cfd2442488971420289a12d5ca8f07816e1149bf Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 13 Aug 2021 13:44:06 +0200 Subject: [PATCH] services: cuirass: Reverse the no-publish logic. This is a follow-up of d128c6fd33f46ec4e2d0ef352d20a858c377bf6f. * gnu/services/cuirass.scm () [no-publish?]: Rename it to ... [publish?]: ... this new field. (cuirass-shepherd-service): Adapt it. * doc/guix.texi (Cuirass remote building): Document it. --- doc/guix.texi | 8 ++++---- gnu/services/cuirass.scm | 12 ++++++------ 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 @@ (define-record-type* (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 @@ (define (cuirass-shepherd-service config) (stop #~(make-kill-destructor))) ,@(if remote-server (match-record remote-server - (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 @@ (define (cuirass-shepherd-service config) "--trigger-substitute-url=" trigger-url)) '()) - #$@(if no-publish? - (list "--no-publish") - '()) + #$@(if publish? + '() + (list "--no-publish")) #$@(if public-key (list (string-append "--public-key="