ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: cuirass: Reverse the no-publish logic.

Browse source 
This is a follow-up of d128c6fd33.

* 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.
This commit is contained in:
Mathieu Othacehe 2021-08-13 13:44:06 +02:00
parent 2caf9eafb6
commit cfd2442488
No known key found for this signature in database
GPG key ID: 8354763531769CA6
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/guix.texi
View file

@ -27889,10 +27889,10 @@ Use @var{cache} directory to cache build log files.
Once a substitute is successfully fetched, trigger substitute baking at Once a substitute is successfully fetched, trigger substitute baking at
@var{trigger-url}. @var{trigger-url}.
@item @code{no-publish} (default: @code{#f}) @item @code{publish?} (default: @code{#t})
Do not start a publish server and ignore the @code{publish-port} If set to false, do not start a publish server and ignore the
argument. This can be useful if there is already a standalone publish @code{publish-port} argument. This can be useful if there is already a
server standing next to the remote server. standalone publish server standing next to the remote server.
@item @code{public-key} @item @code{public-key}
@item @code{private-key} @item @code{private-key}

12
gnu/services/cuirass.scm
View file

@ -73,8 +73,8 @@ (define-record-type* <cuirass-remote-server-configuration>
(default "/var/log/cuirass-remote-server.log")) (default "/var/log/cuirass-remote-server.log"))
(cache cuirass-remote-server-configuration-cache ;string (cache cuirass-remote-server-configuration-cache ;string
(default "/var/cache/cuirass/remote/")) (default "/var/cache/cuirass/remote/"))
(no-publish? cuirass-remote-server-configuration-no-publish? ;boolean (publish? cuirass-remote-server-configuration-publish? ;boolean
(default #f)) (default #t))
(trigger-url cuirass-remote-server-trigger-url ;string (trigger-url cuirass-remote-server-trigger-url ;string
(default #f)) (default #f))
(public-key cuirass-remote-server-configuration-public-key ;string (public-key cuirass-remote-server-configuration-public-key ;string
@ -194,7 +194,7 @@ (define (cuirass-shepherd-service config)
(stop #~(make-kill-destructor))) (stop #~(make-kill-destructor)))
,@(if remote-server ,@(if remote-server
(match-record remote-server <cuirass-remote-server-configuration> (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) trigger-url public-key private-key)
(list (list
(shepherd-service (shepherd-service
@ -228,9 +228,9 @@ (define (cuirass-shepherd-service config)
"--trigger-substitute-url=" "--trigger-substitute-url="
trigger-url)) trigger-url))
'()) '())
#$@(if no-publish? #$@(if publish?
(list "--no-publish") '()
'()) (list "--no-publish"))
#$@(if public-key #$@(if public-key
(list (list
(string-append "--public-key=" (string-append "--public-key="