diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-12-07 17:16:05 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-07 17:16:05 +0100 |
| commit | 5a2f019c7d35d539036825a7d0cc184f0c7dc60a (patch) | |
| tree | 7f31b5deab60d469737073cd9b200c32506952a0 /gnu/services/ssh.scm | |
| parent | 66f217b43aca603326dab17d4dda1a398bf4fb8c (diff) | |
| parent | 0dd91619a597b52bcb5d6d1bb675a9eb65242c44 (diff) | |
| download | guix-5a2f019c7d35d539036825a7d0cc184f0c7dc60a.tar guix-5a2f019c7d35d539036825a7d0cc184f0c7dc60a.tar.gz | |
Merge branch 'version-0.14.0'
Diffstat (limited to 'gnu/services/ssh.scm')
| -rw-r--r-- | gnu/services/ssh.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index b33ec946c6..301ba74041 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -304,7 +304,14 @@ The other options should be self-descriptive." ;; list of user-name/file-like tuples (authorized-keys openssh-authorized-keys - (default '()))) + (default '())) + + ;; Boolean + ;; XXX: This should really be handled in an orthogonal way, for instance as + ;; proposed in <https://bugs.gnu.org/27155>. Keep it internal/undocumented + ;; for now. + (%auto-start? openssh-auto-start? + (default #t))) (define %openssh-accounts (list (user-group (name "sshd") (system? #t)) @@ -445,7 +452,8 @@ of user-name/file-like tuples." (provision '(ssh-daemon)) (start #~(make-forkexec-constructor #$openssh-command #:pid-file #$pid-file)) - (stop #~(make-kill-destructor))))) + (stop #~(make-kill-destructor)) + (auto-start? (openssh-auto-start? config))))) (define (openssh-pam-services config) "Return a list of <pam-services> for sshd with CONFIG." |