~ruther/guix-local

cecd72d55ae974f8ebe900e0088071f843866935 — Ludovic Courtès 12 years ago 257b934
offload: Allow build machines to specify a port number.

* guix/scripts/offload.scm (<build-machine>): Add 'port' field.
  (remote-pipe, send-files): Use lsh's '-p' option when invoking it.
2 files changed, 9 insertions(+), 2 deletions(-)

M doc/guix.texi
M guix/scripts/offload.scm
M doc/guix.texi => doc/guix.texi +3 -0
@@ 345,6 345,9 @@ A number of optional fields may be specified:

@table @code

@item port
Port number of the machine's SSH server (default: 22).

@item private-key
The SSH private key file to use when connecting to the machine.


M guix/scripts/offload.scm => guix/scripts/offload.scm +6 -2
@@ 56,6 56,8 @@
  build-machine make-build-machine
  build-machine?
  (name            build-machine-name)            ; string
  (port            build-machine-port             ; number
                   (default 22))
  (system          build-machine-system)          ; string
  (user            build-machine-user)            ; string
  (private-key     build-machine-private-key      ; file name


@@ 161,8 163,9 @@ determined."
  "Run COMMAND on MACHINE, assuming an lsh gateway has been set up."
  (catch 'system-error
    (lambda ()
      (apply open-pipe* mode %lshg-command
             "-l" (build-machine-user machine) "-z"
      (apply open-pipe* mode %lshg-command "-z"
             "-l" (build-machine-user machine)
             "-p" (build-machine-port machine)

             ;; XXX: Remove '-i' when %LSHG-COMMAND really is lshg.
             "-i" (build-machine-private-key machine)


@@ 328,6 331,7 @@ success, #f otherwise."
           (missing (filtered-port
                     (list (which %lshg-command)
                           "-l" (build-machine-user machine)
                           "-p" (build-machine-port machine)
                           "-i" (build-machine-private-key machine)
                           (build-machine-name machine)
                           "guix" "archive" "--missing")