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

filter out dup CNAMES 

This happens when a docker host has an alias defined, because all docker
hosts are added to the dns, same as other hosts.
This commit is contained in:
Joey Hess 2014-06-01 07:32:16 -04:00
parent 9ce4a434ce
commit 5799b89d9f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Propellor/Property/Dns.hs
View File

@ -339,7 +339,7 @@ genZone hosts zdomain soa =
, map hostrecords inzdomain , map hostrecords inzdomain
, map addcnames (M.elems m) , map addcnames (M.elems m)
] ]
in (Zone zdomain soa (nub zhosts), warnings) in (Zone zdomain soa (simplify zhosts), warnings)
where where
m = hostMap hosts m = hostMap hosts
-- Known hosts with hostname located in the zone's domain. -- Known hosts with hostname located in the zone's domain.
@ -390,6 +390,17 @@ genZone hosts zdomain soa =
l = zip (repeat $ AbsDomain $ hostName h) l = zip (repeat $ AbsDomain $ hostName h)
(S.toList $ S.filter (\r -> isNothing (getIPAddr r) && isNothing (getCNAME r)) (_dns attr)) (S.toList $ S.filter (\r -> isNothing (getIPAddr r) && isNothing (getCNAME r)) (_dns attr))
-- Simplifies the list of hosts. Remove duplicate entries.
-- Also, filter out any CHAMES where the same domain has an
-- IP address, since that's not legal.
simplify :: [(BindDomain, Record)] -> [(BindDomain, Record)]
simplify l = nub $ filter (not . dupcname ) l
where
dupcname (d, CNAME _) | any (matchingaddr d) l = True
dupcname _ = False
matchingaddr d (d', (Address _)) | d == d' = True
matchingaddr _ _ = False
inDomain :: Domain -> BindDomain -> Bool inDomain :: Domain -> BindDomain -> Bool
inDomain domain (AbsDomain d) = domain == d || ('.':domain) `isSuffixOf` d inDomain domain (AbsDomain d) = domain == d || ('.':domain) `isSuffixOf` d
inDomain _ _ = False -- can't tell, so assume not inDomain _ _ = False -- can't tell, so assume not