summaryrefslogtreecommitdiff
path: root/src/Propellor/Types/Dns.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-18 14:14:21 -0400
committerJoey Hess2015-10-18 14:14:21 -0400
commit6c96481dd39d1e0fbcef8dd68300a66e13db9ed9 (patch)
tree81b8c2a296dcaaa0e2cd43ece365cbf39c957e1c /src/Propellor/Types/Dns.hs
parentf6e352767eaf236acb929a9793dee28eb4897baa (diff)
parent2ad09b34ecec5a643a4a08c88a0a1cc7703094e3 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Types/Dns.hs')
-rw-r--r--src/Propellor/Types/Dns.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Types/Dns.hs b/src/Propellor/Types/Dns.hs
index 3497b3ed..d95f1a8b 100644
--- a/src/Propellor/Types/Dns.hs
+++ b/src/Propellor/Types/Dns.hs
@@ -26,7 +26,7 @@ newtype AliasesInfo = AliasesInfo (S.Set HostName)
deriving (Show, Eq, Ord, Monoid, Typeable)
instance IsInfo AliasesInfo where
- propigateInfo _ = False
+ propagateInfo _ = False
toAliasesInfo :: [HostName] -> AliasesInfo
toAliasesInfo l = AliasesInfo (S.fromList l)
@@ -40,10 +40,10 @@ newtype DnsInfo = DnsInfo { fromDnsInfo :: S.Set Record }
toDnsInfo :: S.Set Record -> DnsInfo
toDnsInfo = DnsInfo
--- | DNS Info is propigated, so that eg, aliases of a container
+-- | DNS Info is propagated, so that eg, aliases of a container
-- are reflected in the dns for the host where it runs.
instance IsInfo DnsInfo where
- propigateInfo _ = True
+ propagateInfo _ = True
-- | Represents a bind 9 named.conf file.
data NamedConf = NamedConf
@@ -155,7 +155,7 @@ newtype NamedConfMap = NamedConfMap (M.Map Domain NamedConf)
deriving (Eq, Ord, Show, Typeable)
instance IsInfo NamedConfMap where
- propigateInfo _ = False
+ propagateInfo _ = False
-- | Adding a Master NamedConf stanza for a particulr domain always
-- overrides an existing Secondary stanza for that domain, while a