nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: lsh: Add graceful handling of daemonic option. 

* gnu/services/ssh.scm (lsh-service): New #:keys (daemonic?, pid-file?,
  pid-file).  Build new lshd-command and expand service-requirement
  field.
* doc/guix.texi (Networking Services): Update accordingly.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
nebuli 2014-12-03 22:51:48 +01:00 committed by Ludovic Courtès
parent a677c7267b
commit 5833bf33a2
2 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/guix.texi
View File

@ -4526,7 +4526,7 @@ configuration file.
Furthermore, @code{(gnu services ssh)} provides the following service. Furthermore, @code{(gnu services ssh)} provides the following service.
@deffn {Monadic Procedure} lsh-service [#:host-key "/etc/lsh/host-key"] @ @deffn {Monadic Procedure} lsh-service [#:host-key "/etc/lsh/host-key"] @
[#:interfaces '()] [#:port-number 22] @ [#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @
[#:allow-empty-passwords? #f] [#:root-login? #f] @ [#:allow-empty-passwords? #f] [#:root-login? #f] @
[#:syslog-output? #t] [#:x11-forwarding? #t] @ [#:syslog-output? #t] [#:x11-forwarding? #t] @
[#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @
@ -4535,6 +4535,12 @@ 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 @var{host-key} must designate a file containing the host key, and readable
only by root. only by root.
When @var{daemonic?} is true, @command{lshd} will detach from the
controlling terminal and log its output to syslogd, unless one sets
@var{syslog-output?} to false. Obviously, it also makes lsh-service
depend on existence of syslogd service. When @var{pid-file?} is true,
@command{lshd} writes its PID to the file called @var{pid-file}.
When @var{initialize?} is true, automatically create the seed and host key When @var{initialize?} is true, automatically create the seed and host key
upon service activation if they do not exist yet. This may take long and upon service activation if they do not exist yet. This may take long and
require interaction. require interaction.

64
gnu/services/ssh.scm
View File

@ -73,12 +73,15 @@
(define* (lsh-service #:key (define* (lsh-service #:key
(lsh lsh) (lsh lsh)
(daemonic? #t)
(host-key "/etc/lsh/host-key") (host-key "/etc/lsh/host-key")
(interfaces '()) (interfaces '())
(port-number 22) (port-number 22)
(allow-empty-passwords? #f) (allow-empty-passwords? #f)
(root-login? #f) (root-login? #f)
(syslog-output? #t) (syslog-output? #t)
(pid-file? #f)
(pid-file "/var/run/lshd.pid")
(x11-forwarding? #t) (x11-forwarding? #t)
(tcp/ip-forwarding? #t) (tcp/ip-forwarding? #t)
(password-authentication? #t) (password-authentication? #t)
@ -88,6 +91,12 @@
@var{host-key} must designate a file containing the host key, and readable @var{host-key} must designate a file containing the host key, and readable
only by root. only by root.
When @var{daemonic?} is true, @command{lshd} will detach from the
controlling terminal and log its output to syslogd, unless one sets
@var{syslog-output?} to false. Obviously, it also makes lsh-service
depend on existence of syslogd service. When @var{pid-file?} is true,
@command{lshd} writes its PID to the file called @var{pid-file}.
When @var{initialize?} is true, automatically create the seed and host key When @var{initialize?} is true, automatically create the seed and host key
upon service activation if they do not exist yet. This may take long and upon service activation if they do not exist yet. This may take long and
require interaction. require interaction.
@ -107,30 +116,47 @@ root.
The other options should be self-descriptive." The other options should be self-descriptive."
(define lsh-command (define lsh-command
(cons* #~(string-append #$lsh "/sbin/lshd") (append
#~(string-append "--host-key=" #$host-key) (cons #~(string-append #$lsh "/sbin/lshd")
#~(string-append "--password-helper=" #$lsh "/sbin/lsh-pam-checkpw") (if daemonic?
#~(string-append "--subsystems=sftp=" #$lsh "/sbin/sftp-server") (let ((syslog (if syslog-output? '()
"-p" (number->string port-number) (list "--no-syslog"))))
(if password-authentication? "--password" "--no-password") (cons "--daemonic"
(if public-key-authentication? (if pid-file?
"--publickey" "--no-publickey") (cons #~(string-append "--pid-file=" #$pid-file)
(if root-login? syslog)
"--root-login" "--no-root-login") (cons "--no-pid-file" syslog))))
(if x11-forwarding? (if pid-file?
"--x11-forward" "--no-x11-forward") (list #~(string-append "--pid-file=" #$pid-file))
(if tcp/ip-forwarding? '())))
"--tcpip-forward" "--no-tcpip-forward") (cons* #~(string-append "--host-key=" #$host-key)
(if (null? interfaces) #~(string-append "--password-helper=" #$lsh "/sbin/lsh-pam-checkpw")
'() #~(string-append "--subsystems=sftp=" #$lsh "/sbin/sftp-server")
(list (string-append "--interfaces=" "-p" (number->string port-number)
(string-join interfaces ",")))))) (if password-authentication? "--password" "--no-password")
(if public-key-authentication?
"--publickey" "--no-publickey")
(if root-login?
"--root-login" "--no-root-login")
(if x11-forwarding?
"--x11-forward" "--no-x11-forward")
(if tcp/ip-forwarding?
"--tcpip-forward" "--no-tcpip-forward")
(if (null? interfaces)
'()
(list (string-append "--interfaces="
(string-join interfaces ",")))))))
(define requires
(if (and daemonic? syslog-output?)
'(networking syslogd)
'(networking)))
(with-monad %store-monad (with-monad %store-monad
(return (service (return (service
(documentation "GNU lsh SSH server") (documentation "GNU lsh SSH server")
(provision '(ssh-daemon)) (provision '(ssh-daemon))
(requirement '(networking)) (requirement requires)
(start #~(make-forkexec-constructor (list #$@lsh-command))) (start #~(make-forkexec-constructor (list #$@lsh-command)))
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor))
(pam-services (pam-services