From d3e6b42156a0b1e0a40cdf8862120a43da72a91d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 16 Apr 2014 18:41:48 +0200 Subject: Add support for SSH ed25519 keys This works with both host and user keys. (cherry picked from commit 763c65b84f9505b3b2e98b982e2e6cdaf5b662bc) --- Propellor/Property/Ssh.hs | 1 + Propellor/Types.hs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'Propellor') 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) -- cgit v1.2.3 From ecf10abc478fefe239d469c2f03f05583ed4782b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Apr 2014 19:32:10 -0400 Subject: flock local directory to prevent multiple obnams stacking up --- Propellor/Property/Obnam.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Propellor') diff --git a/Propellor/Property/Obnam.hs b/Propellor/Property/Obnam.hs index 00e0bbef..1e861588 100644 --- a/Propellor/Property/Obnam.hs +++ b/Propellor/Property/Obnam.hs @@ -46,7 +46,7 @@ backup dir crontimes params numclients = cronjob `describe` desc where desc = dir ++ " backed up by obnam" cronjob = Cron.niceJob ("obnam_backup" ++ dir) crontimes "root" "/" $ - intercalate ";" $ catMaybes + intercalate ";" $ map flockcmd $ catMaybes [ if numclients == OnlyClient then Just $ unwords $ [ "obnam" @@ -59,6 +59,7 @@ backup dir crontimes params numclients = cronjob `describe` desc , shellEscape dir ] ++ map shellEscape params ] + flockcmd cmd = "flock -n " ++ shellEscape dir ++ " " ++ cmd -- | Restores a directory from an obnam backup. -- -- cgit v1.2.3