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.
 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 99b137e05ea..f0df5a68249 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="