aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-04-03 22:12:26 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-03 22:58:49 +0200
commit21cc905ac20c1e9dec4610f92b3d2202f2e9dcb2 (patch)
tree0e5663a8bf847bf361d4e7b59fceb4e3fa59d617
parent849eebbb38dfc7241494899b49e7e28ee7d661c5 (diff)
downloadguix-21cc905ac20c1e9dec4610f92b3d2202f2e9dcb2.tar
guix-21cc905ac20c1e9dec4610f92b3d2202f2e9dcb2.tar.gz
services: lsh: Change #:initialize? to default to #t.
* gnu/services/ssh.scm (lsh-service): Change #:initialize? to default to #t. * doc/guix.texi (Using the Configuration System): Remove #:initialize? #t from example. (Networking Services): Adjust accordingly.
-rw-r--r--doc/guix.texi5
-rw-r--r--gnu/services/ssh.scm2
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 677fc57c1a..fdf65c72b9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3776,8 +3776,7 @@ kernel, initial RAM disk, and boot loader looks like this:
(comment "Bob's sister")
(home-directory "/home/alice"))))
(packages (cons emacs %base-packages))
- (services (cons (lsh-service #:port 2222 #:root-login? #t
- #:initialize? #t)
+ (services (cons (lsh-service #:port 2222 #:root-login? #t)
%base-services)))
@end lisp
@@ -4596,7 +4595,7 @@ Furthermore, @code{(gnu services ssh)} provides the following service.
[#:allow-empty-passwords? #f] [#:root-login? #f] @
[#:syslog-output? #t] [#:x11-forwarding? #t] @
[#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @
- [#:public-key-authentication? #t] [#:initialize? #f]
+ [#:public-key-authentication? #t] [#:initialize? #t]
Run the @command{lshd} program from @var{lsh} to listen on port @var{port-number}.
@var{host-key} must designate a file containing the host key, and readable
only by root.
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 9537958df7..e2f85421e9 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -86,7 +86,7 @@
(tcp/ip-forwarding? #t)
(password-authentication? #t)
(public-key-authentication? #t)
- initialize?)
+ (initialize? #t))
"Run the @command{lshd} program from @var{lsh} to listen on port @var{port-number}.
@var{host-key} must designate a file containing the host key, and readable
only by root.