me/guix
Archived
1
0
Fork 0
Code Activity

services: openssh: Add 'subsystems' option.

Browse source 
* gnu/services/ssh.scm (openssh-config-file): Add it.
(<openssh-configuration>)[subsystems]: Add it.
* doc/guix.texi (Networking Services): Document it.
This commit is contained in:
Clément Lassieur 2017-02-21 00:53:55 +01:00
parent 4ca3e9b7b6
commit 12723370e5
No known key found for this signature in database
GPG key ID: 89F96D4808F359C7
2 changed files with 62 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/guix.texi
View file

@ -9511,6 +9511,22 @@ equivalent role to password authentication, you should disable either
@item @code{print-last-log?} (default: @code{#t}) @item @code{print-last-log?} (default: @code{#t})
Specifies whether @command{sshd} should print the date and time of the Specifies whether @command{sshd} should print the date and time of the
last user login when a user logs in interactively. last user login when a user logs in interactively.
@item @code{subsystems} (default: @code{'(("sftp" "internal-sftp"))})
Configures external subsystems (e.g. file transfer daemon).
This is a list of two-element lists, each of which containing the
subsystem name and a command (with optional arguments) to execute upon
subsystem request.
The command @command{internal-sftp} implements an in-process SFTP
server. Alternately, one can specify the @command{sftp-server} command:
@example
(service openssh-service-type
(openssh-configuration
(subsystems
'(("sftp" ,(file-append openssh "/libexec/sftp-server"))))))
@end example
@end table @end table
@end deftp @end deftp

21
gnu/services/ssh.scm
View file

@ -292,7 +292,10 @@ The other options should be self-descriptive."
(default #t)) (default #t))
;; Boolean ;; Boolean
(print-last-log? openssh-configuration-print-last-log? (print-last-log? openssh-configuration-print-last-log?
(default #t))) (default #t))
;; list of two-element lists
(subsystems openssh-configuration-subsystems
(default '(("sftp" "internal-sftp")))))
(define %openssh-accounts (define %openssh-accounts
(list (user-group (name "sshd") (system? #t)) (list (user-group (name "sshd") (system? #t))
@ -327,11 +330,14 @@ The other options should be self-descriptive."
"Return the sshd configuration file corresponding to CONFIG." "Return the sshd configuration file corresponding to CONFIG."
(computed-file (computed-file
"sshd_config" "sshd_config"
#~(call-with-output-file #$output #~(begin
(use-modules (ice-9 match))
(call-with-output-file #$output
(lambda (port) (lambda (port)
(display "# Generated by 'openssh-service'.\n" port) (display "# Generated by 'openssh-service'.\n" port)
(format port "Port ~a\n" (format port "Port ~a\n"
#$(number->string (openssh-configuration-port-number config))) #$(number->string
(openssh-configuration-port-number config)))
(format port "PermitRootLogin ~a\n" (format port "PermitRootLogin ~a\n"
#$(match (openssh-configuration-permit-root-login config) #$(match (openssh-configuration-permit-root-login config)
(#t "yes") (#t "yes")
@ -344,7 +350,8 @@ The other options should be self-descriptive."
#$(if (openssh-configuration-password-authentication? config) #$(if (openssh-configuration-password-authentication? config)
"yes" "no")) "yes" "no"))
(format port "PubkeyAuthentication ~a\n" (format port "PubkeyAuthentication ~a\n"
#$(if (openssh-configuration-public-key-authentication? config) #$(if (openssh-configuration-public-key-authentication?
config)
"yes" "no")) "yes" "no"))
(format port "X11Forwarding ~a\n" (format port "X11Forwarding ~a\n"
#$(if (openssh-configuration-x11-forwarding? config) #$(if (openssh-configuration-x11-forwarding? config)
@ -360,7 +367,11 @@ The other options should be self-descriptive."
(format port "PrintLastLog ~a\n" (format port "PrintLastLog ~a\n"
#$(if (openssh-configuration-print-last-log? config) #$(if (openssh-configuration-print-last-log? config)
"yes" "no")) "yes" "no"))
#t)))) (for-each
(match-lambda
((name command) (format port "Subsystem\t~a\t~a\n" name command)))
'#$(openssh-configuration-subsystems config))
#t)))))
(define (openssh-shepherd-service config) (define (openssh-shepherd-service config)
"Return a <shepherd-service> for openssh with CONFIG." "Return a <shepherd-service> for openssh with CONFIG."