cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ssh.hostKeys now also installs any available SshEd25519 keys.

This commit is contained in:
Joey Hess 2015-01-04 15:59:42 -04:00
parent f1a1d0001a
commit 84685f24c9
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -7,7 +7,8 @@ propellor (1.3.0) UNRELEASED; urgency=medium
* Update intermediary propellor in --spin --via * Update intermediary propellor in --spin --via
* Added support for DNSSEC. * Added support for DNSSEC.
* sshPubKey is renamed to Ssh.pubKey, and has an added SshKeyType * sshPubKey is renamed to Ssh.pubKey, and has an added SshKeyType
parameter. parameter. (API change)
* Ssh.hostKeys now also installs any available SshEd25519 keys.
* Fix build with process 1.2.1.0. * Fix build with process 1.2.1.0.
-- Joey Hess <id@joeyh.name> Thu, 01 Jan 2015 13:27:23 -0400 -- Joey Hess <id@joeyh.name> Thu, 01 Jan 2015 13:27:23 -0400

9
src/Propellor/Property/Ssh.hs
View File

@ -90,13 +90,10 @@ pubKey t k = pureInfoProperty ("ssh pubkey known") $
getPubKey :: Propellor (M.Map SshKeyType String) getPubKey :: Propellor (M.Map SshKeyType String)
getPubKey = asks (_sshPubKey . hostInfo) getPubKey = asks (_sshPubKey . hostInfo)
-- | Installs all commonly used types of ssh host keys. -- | Installs all available types of ssh host keys.
hostKeys :: IsContext c => c -> Property hostKeys :: IsContext c => c -> Property
hostKeys ctx = propertyList "known ssh host keys" hostKeys ctx = propertyList "known ssh host keys" $
[ hostKey SshDsa ctx map (flip hostKey ctx) [minBound..maxBound]
, hostKey SshRsa ctx
, hostKey SshEcdsa ctx
]
-- | Installs a single ssh host key. -- | Installs a single ssh host key.
-- --

2
src/Propellor/Types/PrivData.hs
View File

@ -90,7 +90,7 @@ hostContext = HostContext Context
type PrivData = String type PrivData = String
data SshKeyType = SshRsa | SshDsa | SshEcdsa | SshEd25519 data SshKeyType = SshRsa | SshDsa | SshEcdsa | SshEd25519
deriving (Read, Show, Ord, Eq) deriving (Read, Show, Ord, Eq, Enum, Bounded)
-- | Parameter that would be passed to ssh-keygen to generate key of this type -- | Parameter that would be passed to ssh-keygen to generate key of this type
sshKeyTypeParam :: SshKeyType -> String sshKeyTypeParam :: SshKeyType -> String