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

propellor spin

This commit is contained in:
Joey Hess 2014-04-13 03:21:02 -04:00
parent 90a6a6cb58
commit 427246db6a
Failed to extract signature
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Propellor/Property/Ssh.hs
View File

@ -85,7 +85,7 @@ hostKey keytype = propertyList desc
, Property desc (install writeFileProtected (SshPrivKey keytype "") "")
]
where
desc = "known ssh host key"
desc = "known ssh host key (" ++ fromKeyType keytype ++ ")"
install writer p ext = withPrivData p $ \key -> do
let f = "/etc/ssh/ssh_host_" ++ fromKeyType keytype ++ "key" ++ ext
void $ liftIO $ writer f key
@ -99,7 +99,7 @@ keyImported keytype user = propertyList desc
, Property desc (install writeFileProtected (SshPrivKey keytype user) "")
]
where
desc = user ++ " has ssh key"
desc = user ++ " has ssh key (" ++ fromKeyType keytype ++ ")"
install writer p ext = do
f <- liftIO $ keyfile ext
ifM (liftIO $ doesFileExist f)
@ -136,5 +136,6 @@ authorizedKeys :: UserName -> Property
authorizedKeys user = Property (user ++ " has authorized_keys") $
withPrivData (SshAuthorizedKeys user) $ \v -> liftIO $ do
f <- liftIO $ dotFile "authorized_keys" user
createDirectoryIfMissing True (takeDirectory f)
writeFileProtected f v
return NoChange