From 31739ac1a60b461519702b24e14df98cf173941b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 Jan 2015 16:19:32 -0400 Subject: propellor spin --- src/Propellor/Spin.hs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index a6744bf4..14275957 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -96,14 +96,12 @@ spin target relay hst = do -- the host in it at all, use one of the Host's IPs instead. getSshTarget :: HostName -> Host -> IO String getSshTarget target hst - | null configips = go =<< tryIO (BSD.getHostByName target) - | otherwise = return target + | null configips = return target + | otherwise = go =<< tryIO (BSD.getHostByName target) where go (Left e) = useip (show e) go (Right hostentry) = ifM (anyM matchingconfig (BSD.hostAddresses hostentry)) - ( do - print "MATCHING IP" - return target + ( return target , do ips <- mapM inet_ntoa (BSD.hostAddresses hostentry) useip ("DNS " ++ show ips ++ " vs configured " ++ show configips) -- cgit v1.2.3