From dd32a63a07107a749a5a8e7ab1d2b0d629ac4538 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Jul 2014 12:25:38 -0400 Subject: [PATCH] propellor spin --- src/Propellor/Engine.hs | 4 +++- src/Propellor/Property/Ssh.hs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs index a3fc0f3..b4260e9 100644 --- a/src/Propellor/Engine.hs +++ b/src/Propellor/Engine.hs @@ -44,6 +44,8 @@ ensureProperty = catchPropellor . propertySatisfy -- For example, `fromHost hosts "otherhost" getSshPubKey` fromHost :: [Host] -> HostName -> Propellor a -> Propellor (Maybe a) 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 <$> runReaderT (runWithHost getter) h diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index 5a26047..76f0367 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -148,8 +148,8 @@ knownHost hosts hn user = property desc $ , f `File.containsLine` (hn ++ " " ++ k) , File.ownerGroup f user user ] - go _ = do - warningMessage $ "no configred sshPubKey for " ++ hn + go v = do + warningMessage $ "no configred sshPubKey for " ++ hn ++ " " ++ show v return FailedChange -- | Makes a user have authorized_keys from the PrivData