propellor spin
This commit is contained in:
parent
90a6a6cb58
commit
427246db6a
|
@ -85,7 +85,7 @@ hostKey keytype = propertyList desc
|
||||||
, Property desc (install writeFileProtected (SshPrivKey keytype "") "")
|
, Property desc (install writeFileProtected (SshPrivKey keytype "") "")
|
||||||
]
|
]
|
||||||
where
|
where
|
||||||
desc = "known ssh host key"
|
desc = "known ssh host key (" ++ fromKeyType keytype ++ ")"
|
||||||
install writer p ext = withPrivData p $ \key -> do
|
install writer p ext = withPrivData p $ \key -> do
|
||||||
let f = "/etc/ssh/ssh_host_" ++ fromKeyType keytype ++ "key" ++ ext
|
let f = "/etc/ssh/ssh_host_" ++ fromKeyType keytype ++ "key" ++ ext
|
||||||
void $ liftIO $ writer f key
|
void $ liftIO $ writer f key
|
||||||
|
@ -99,7 +99,7 @@ keyImported keytype user = propertyList desc
|
||||||
, Property desc (install writeFileProtected (SshPrivKey keytype user) "")
|
, Property desc (install writeFileProtected (SshPrivKey keytype user) "")
|
||||||
]
|
]
|
||||||
where
|
where
|
||||||
desc = user ++ " has ssh key"
|
desc = user ++ " has ssh key (" ++ fromKeyType keytype ++ ")"
|
||||||
install writer p ext = do
|
install writer p ext = do
|
||||||
f <- liftIO $ keyfile ext
|
f <- liftIO $ keyfile ext
|
||||||
ifM (liftIO $ doesFileExist f)
|
ifM (liftIO $ doesFileExist f)
|
||||||
|
@ -136,5 +136,6 @@ authorizedKeys :: UserName -> Property
|
||||||
authorizedKeys user = Property (user ++ " has authorized_keys") $
|
authorizedKeys user = Property (user ++ " has authorized_keys") $
|
||||||
withPrivData (SshAuthorizedKeys user) $ \v -> liftIO $ do
|
withPrivData (SshAuthorizedKeys user) $ \v -> liftIO $ do
|
||||||
f <- liftIO $ dotFile "authorized_keys" user
|
f <- liftIO $ dotFile "authorized_keys" user
|
||||||
|
createDirectoryIfMissing True (takeDirectory f)
|
||||||
writeFileProtected f v
|
writeFileProtected f v
|
||||||
return NoChange
|
return NoChange
|
||||||
|
|
Loading…
Reference in New Issue