me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2022-03-10 23:45:06 +01:00
parent 1b8f6a4cad
commit 5397c18157
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/services/ssh.scm
View File

@ -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