diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-03-10 23:45:06 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-03-10 23:46:51 +0100 |
| commit | 5397c18157f12e9127b5a9a59b0aa5a4eb058839 (patch) | |
| tree | cefb38857e5df0561dc72b088d92417608a5047f /gnu/services/ssh.scm | |
| parent | 1b8f6a4cadf1715d3e4dc03dde06956fa3defdb6 (diff) | |
| download | guix-5397c18157f12e9127b5a9a59b0aa5a4eb058839.tar.gz | |
services: openssh: Change 'authorized-keys' accessor name.
* gnu/services/ssh.scm (<openssh-configuration>)[authorized-keys]: Rename accessor to 'openssh-configuration-authorized-keys'. (openssh-activation, extend-openssh-authorized-keys): Adjust accordingly.
Diffstat (limited to 'gnu/services/ssh.scm')
| -rw-r--r-- | gnu/services/ssh.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index 433a0e8f91..5c8fe4eef4 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -348,7 +348,7 @@ The other options should be self-descriptive." (default "")) ;; list of user-name/file-like tuples - (authorized-keys openssh-authorized-keys + (authorized-keys openssh-configuration-authorized-keys (default '())) ;; Boolean @@ -396,7 +396,7 @@ The other options should be self-descriptive." (unless (= ENOENT (system-error-errno args)) (apply throw args)))) (copy-recursively #$(authorized-key-directory - (openssh-authorized-keys config)) + (openssh-configuration-authorized-keys config)) "/etc/ssh/authorized_keys.d") (chmod "/etc/ssh/authorized_keys.d" #o555) @@ -541,10 +541,11 @@ of user-name/file-like tuples." (openssh-configuration (inherit config) (authorized-keys - (match (openssh-authorized-keys config) + (match (openssh-configuration-authorized-keys config) (((users _ ...) ...) ;; Build a user/key-list mapping. - (let ((user-keys (alist->vhash (openssh-authorized-keys config)))) + (let ((user-keys (alist->vhash + (openssh-configuration-authorized-keys config)))) ;; Coalesce the key lists associated with each user. (map (lambda (user) `(,user |