diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-01-04 21:32:30 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-04 21:32:30 -0400 |
| commit | 0235e88ea22c092b43aa0cf709e8c63d8556700a (patch) | |
| tree | b58f6d4cbaf69dc514c45ae9b13660a7bf8b0aa0 /src | |
| parent | 18a6b982d34311101dac9f9c947635ce29a717f3 (diff) | |
| parent | 4c2c2785c843cfcf11fd12ac128367d6a41bc6fc (diff) | |
Merge branch 'joeyconfig'
Conflicts:
src/Propellor/Property/Dns.hs
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Dns.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Propellor/Property/Dns.hs b/src/Propellor/Property/Dns.hs index e19d82c5..ceda2e07 100644 --- a/src/Propellor/Property/Dns.hs +++ b/src/Propellor/Property/Dns.hs @@ -80,7 +80,7 @@ setupPrimary zonefile mknamedconffile hosts domain soa rs = baseprop = Property ("dns primary for " ++ domain) satisfy (addNamedConf conf) satisfy = do - sshfps <- concat <$> mapM (genSSHFP domain) indomain + sshfps <- concat <$> mapM (genSSHFP domain) (M.elems hostmap) let zone = partialzone { zHosts = zHosts partialzone ++ rs ++ sshfps } ifM (liftIO $ needupdate zone) @@ -510,8 +510,8 @@ addNamedConf conf = mempty { _namedconf = NamedConfMap (M.singleton domain conf) getNamedConf :: Propellor (M.Map Domain NamedConf) getNamedConf = asks $ fromNamedConfMap . _namedconf . hostInfo --- | Generates SSHFP records for hosts that have configured --- ssh public keys. +-- | Generates SSHFP records for hosts in the domain (or with CNAMES +-- in the domain) that have configured ssh public keys. -- -- This is done using ssh-keygen, so sadly needs IO. genSSHFP :: Domain -> Host -> Propellor [(BindDomain, Record)] @@ -519,9 +519,9 @@ genSSHFP domain h = concatMap mk . concat <$> (gen =<< get) where get = fromHost [h] hostname Ssh.getPubKey gen = liftIO . mapM genSSHFP' . M.elems . fromMaybe M.empty - mk r = map (\d -> (d, r)) (AbsDomain hostname : cnames) - cnames = filter (inDomain domain) $ - mapMaybe getCNAME $ S.toList $ _dns info + mk r = mapMaybe (\d -> if inDomain domain d then Just (d, r) else Nothing) + (AbsDomain hostname : cnames) + cnames = mapMaybe getCNAME $ S.toList $ _dns info hostname = hostName h info = hostInfo h |