diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-23 12:25:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-23 12:25:38 -0400 |
| commit | dd32a63a07107a749a5a8e7ab1d2b0d629ac4538 (patch) | |
| tree | 51b23f4907efbff81bc8ceab8825bcb5bf2c3d43 /src | |
| parent | ecc275cfeb9dc2c18abe525f3a93aad7614e1a0c (diff) | |
propellor spin
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Engine.hs | 4 | ||||
| -rw-r--r-- | 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 a3fc0f30..b4260e9f 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 5a260476..76f03671 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 |
