diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-29 16:21:22 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-29 16:21:22 -0700 |
commit | 3959be03083f1a9710546ef8dc0f4a645c0d2f9e (patch) | |
tree | 74f496c23019ff619932c1ffedf02dac773ecddf /src/property/sshd.lisp | |
parent | 6279bd8b9d742b858a095fbca1159b2cf1df2431 (diff) | |
download | consfigurator-3959be03083f1a9710546ef8dc0f4a645c0d2f9e.tar.gz |
export SSHD:HOST-PUBLIC-KEYS hostattr, unexport GET-HOST-PUBLIC-KEYS
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/sshd.lisp')
-rw-r--r-- | src/property/sshd.lisp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/property/sshd.lisp b/src/property/sshd.lisp index 8d1022c..78c954b 100644 --- a/src/property/sshd.lisp +++ b/src/property/sshd.lisp @@ -54,7 +54,7 @@ refuses to proceed if root has no authorized_keys." (defprop has-host-public-key :posix (type public-key) "Records an SSH public key of type TYPE as identifying this host." (:desc #?"Has SSH host key of type ${type}") - (:hostattrs (push-hostattr 'host-public-key (cons type public-key)))) + (:hostattrs (push-hostattr 'host-public-keys (cons type public-key)))) (defproplist has-host-key :posix (type public-key) "Installs the host key whose public part is PUBLIC-KEY and is of type TYPE. @@ -66,15 +66,3 @@ The private key is obtained as an item of prerequisite data." public-key) (file:host-secret-uploaded (merge-pathnames (strcat "ssh_host_" type "_key") #P"/etc/ssh/"))) - -(defun get-host-public-keys (host &key short-hostname (aliases t) - (ips t) additional-names) - (let* ((host (preprocess-host host)) - (hostname (get-hostname host)) - (short (and short-hostname (list (get-short-hostname host)))) - (aliases (and aliases (get-hostattrs :aliases host))) - (ips (and ips (append (get-hostattrs :ipv6 host) - (get-hostattrs :ipv4 host))))) - (cons (format nil "~{~A~^,~}" - (cons hostname (append aliases short ips additional-names))) - (mapcar #'cdr (get-hostattrs 'host-public-key host))))) |