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

propellor spin

This commit is contained in:
Joey Hess 2015-01-08 22:51:09 -04:00
parent c4a1e61d26
commit 0c66be1aae
Failed to extract signature
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Propellor/Spin.hs
View File

@ -112,8 +112,14 @@ getSshTarget target hst
useip why = case headMaybe configips of useip why = case headMaybe configips of
Nothing -> return target Nothing -> return target
Just ip -> do Just ip -> do
warningMessage $ "DNS seems out of date for " ++ target ++ " (" ++ why ++ "); using IP address from configuration instead." -- If we're being asked to run on the local host,
return ip -- ignore DNS.
s <- takeWhile (/= '\n') <$> readProcess "hostname" ["-f"]
if s == target
then return target
else do
warningMessage $ "DNS seems out of date for " ++ target ++ " (" ++ why ++ "); using IP address from configuration instead."
return ip
configips = map fromIPAddr $ mapMaybe getIPAddr $ configips = map fromIPAddr $ mapMaybe getIPAddr $
S.toList $ _dns $ hostInfo hst S.toList $ _dns $ hostInfo hst