[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: store: Support 'ssh://' URIs in 'GUIX_DAEMON_SOCKET'.
From: |
Ludovic Courtès |
Subject: |
03/03: store: Support 'ssh://' URIs in 'GUIX_DAEMON_SOCKET'. |
Date: |
Fri, 21 Apr 2017 13:18:53 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 285f63e805f4a895c1d301efe6d40e93c4e2f704
Author: Ludovic Courtès <address@hidden>
Date: Fri Apr 21 19:13:32 2017 +0200
store: Support 'ssh://' URIs in 'GUIX_DAEMON_SOCKET'.
This allows 'guix' commands to talk to a remote store over SSH.
* guix/store.scm (connect-to-daemon)[connect]: Call 'resolve-interface'
for unknown URI schemes.
* guix/store/ssh.scm: New file.
* Makefile.am (MODULES): Add it.
* doc/guix.texi (The Store): Document it. Mark remote access as
experimental.
---
Makefile.am | 3 ++-
doc/guix.texi | 21 +++++++++++++++++++++
guix/store.scm | 22 +++++++++++++++++++---
guix/store/ssh.scm | 39 +++++++++++++++++++++++++++++++++++++++
4 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a997ed8..db4ebe0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,7 +187,8 @@ if HAVE_GUILE_SSH
MODULES += \
guix/ssh.scm \
- guix/scripts/copy.scm
+ guix/scripts/copy.scm \
+ guix/store/ssh.scm
endif HAVE_GUILE_SSH
diff --git a/doc/guix.texi b/doc/guix.texi
index 8f64647..0d334e3 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3696,9 +3696,30 @@ guix://master.guix.example.org:1234
This setup is suitable on local networks, such as clusters, where only
trusted nodes may connect to the build daemon at
@code{master.guix.example.org}.
+
address@hidden ssh
address@hidden SSH access to build daemons
+These URIs allow you to connect to a remote daemon over
address@hidden feature requires Guile-SSH (@pxref{Requirements}).}.
+A typical URL might look like this:
+
address@hidden
+ssh://charlie@@guix.example.org:22
address@hidden example
+
+As for @command{guix copy}, the usual OpenSSH client configuration files
+are honored (@pxref{Invoking guix copy}).
@end table
Additional URI schemes may be supported in the future.
+
address@hidden XXX: Remove this note when the protocol incurs fewer round trips
address@hidden and when (guix derivations) no longer relies on file system
access.
address@hidden Note
+The ability to connect to remote build daemons is considered
+experimental as of @value{VERSION}. Please get in touch with us to
+share any problems or suggestions you may have (@pxref{Contributing}).
address@hidden quotation
@end defvr
@deffn {Scheme Procedure} open-connection address@hidden [#:reserve-space? #t]
diff --git a/guix/store.scm b/guix/store.scm
index 752da98..683f071 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -411,6 +411,11 @@
(define (connect-to-daemon uri)
"Connect to the daemon at URI, a string that may be an actual URI or a file
name."
+ (define (not-supported)
+ (raise (condition (&nix-connection-error
+ (file uri)
+ (errno ENOTSUP)))))
+
(define connect
(match (string->uri uri)
(#f ;URI is a file name
@@ -428,10 +433,21 @@ name."
(errno EBADR))))) ;bah!
(open-inet-socket (uri-host uri) (uri-port uri))))
+ ((? symbol? scheme)
+ ;; Try to dynamically load a module for SCHEME.
+ ;; XXX: Errors are swallowed.
+ (match (false-if-exception
+ (resolve-interface `(guix store ,scheme)))
+ ((? module? module)
+ (match (false-if-exception
+ (module-ref module 'connect-to-daemon))
+ ((? procedure? connect)
+ (lambda (_)
+ (connect uri)))
+ (x (not-supported))))
+ (#f (not-supported))))
(x
- (raise (condition (&nix-connection-error
- (file (uri->string uri))
- (errno ENOTSUP)))))))))
+ (not-supported))))))
(connect uri))
diff --git a/guix/store/ssh.scm b/guix/store/ssh.scm
new file mode 100644
index 0000000..09c0832
--- /dev/null
+++ b/guix/store/ssh.scm
@@ -0,0 +1,39 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 Ludovic Courtès <address@hidden>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix store ssh)
+ #:use-module (guix ssh)
+ #:use-module (web uri)
+ #:export (connect-to-daemon))
+
+;;; Commentary:
+;;;
+;;; This modules provides the entry point for 'open-connection' in (guix
+;;; store). Passing an 'ssh://' URI to 'open-connection' triggers the use of
+;;; the code in this module.
+;;;
+;;; End:
+
+(define (connect-to-daemon uri)
+ "Connect to the SSH daemon at URI, a URI object with the 'ssh' scheme."
+ (remote-daemon-channel
+ (open-ssh-session (uri-host uri)
+ #:port (or (uri-port uri) 22)
+ #:user (uri-userinfo uri))))
+
+;;; ssh.scm ends here