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

propellor spin

This commit is contained in:
Joey Hess 2014-07-23 12:25:38 -04:00
parent ecc275cfeb
commit dd32a63a07
Failed to extract signature
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Propellor/Engine.hs
View File

@ -44,6 +44,8 @@ ensureProperty = catchPropellor . propertySatisfy
-- For example, `fromHost hosts "otherhost" getSshPubKey` -- For example, `fromHost hosts "otherhost" getSshPubKey`
fromHost :: [Host] -> HostName -> Propellor a -> Propellor (Maybe a) fromHost :: [Host] -> HostName -> Propellor a -> Propellor (Maybe a)
fromHost l hn getter = case findHost l hn of fromHost l hn getter = case findHost l hn of
Nothing -> return Nothing Nothing -> do
liftIO $ print "fromHost found Nothing"
return Nothing
Just h -> liftIO $ Just <$> Just h -> liftIO $ Just <$>
runReaderT (runWithHost getter) h runReaderT (runWithHost getter) h

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

@ -148,8 +148,8 @@ knownHost hosts hn user = property desc $
, f `File.containsLine` (hn ++ " " ++ k) , f `File.containsLine` (hn ++ " " ++ k)
, File.ownerGroup f user user , File.ownerGroup f user user
] ]
go _ = do go v = do
warningMessage $ "no configred sshPubKey for " ++ hn warningMessage $ "no configred sshPubKey for " ++ hn ++ " " ++ show v
return FailedChange return FailedChange
-- | Makes a user have authorized_keys from the PrivData -- | Makes a user have authorized_keys from the PrivData