diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2014-04-16 18:41:48 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2014-04-16 18:41:48 +0200 |
| commit | 763c65b84f9505b3b2e98b982e2e6cdaf5b662bc (patch) | |
| tree | 721322039245eae1919662b2fb34ccf38064e026 | |
| parent | ba058d77a778058887f5c678b10e3c5ac599c50c (diff) | |
Add support for SSH ed25519 keys
This works with both host and user keys.
| -rw-r--r-- | Propellor/Property/Ssh.hs | 1 | ||||
| -rw-r--r-- | Propellor/Types.hs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Propellor/Property/Ssh.hs b/Propellor/Property/Ssh.hs index b13a12bf..a39792cf 100644 --- a/Propellor/Property/Ssh.hs +++ b/Propellor/Property/Ssh.hs @@ -122,6 +122,7 @@ fromKeyType :: SshKeyType -> String fromKeyType SshRsa = "rsa" fromKeyType SshDsa = "dsa" fromKeyType SshEcdsa = "ecdsa" +fromKeyType SshEd25519 = "ed25519" -- | Puts some host's ssh public key into the known_hosts file for a user. knownHost :: [Host] -> HostName -> UserName -> Property diff --git a/Propellor/Types.hs b/Propellor/Types.hs index 5f575daf..fc767cd2 100644 --- a/Propellor/Types.hs +++ b/Propellor/Types.hs @@ -150,5 +150,5 @@ data PrivDataField type GpgKeyId = String -data SshKeyType = SshRsa | SshDsa | SshEcdsa +data SshKeyType = SshRsa | SshDsa | SshEcdsa | SshEd25519 deriving (Read, Show, Ord, Eq) |