From 2ad09b34ecec5a643a4a08c88a0a1cc7703094e3 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 18 Oct 2015 17:11:50 +0200 Subject: fix typo: propigate → propagate --- debian/changelog | 2 +- doc/usage.mdwn | 2 +- src/Propellor/PrivData.hs | 4 ++-- src/Propellor/PropAccum.hs | 8 ++++---- src/Propellor/Property/Chroot.hs | 8 ++++---- src/Propellor/Property/DnsSec.hs | 2 +- src/Propellor/Property/Docker.hs | 8 ++++---- src/Propellor/Property/List.hs | 2 +- src/Propellor/Property/Spin.hs | 4 ++-- src/Propellor/Property/Ssh.hs | 4 ++-- src/Propellor/Property/Systemd.hs | 2 +- src/Propellor/Types/Chroot.hs | 2 +- src/Propellor/Types/Dns.hs | 8 ++++---- src/Propellor/Types/Docker.hs | 2 +- src/Propellor/Types/Info.hs | 12 ++++++------ 15 files changed, 35 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 957b9ec3..e8607682 100644 --- a/debian/changelog +++ b/debian/changelog @@ -305,7 +305,7 @@ propellor (1.3.0) unstable; urgency=medium propellor (1.2.2) unstable; urgency=medium * Revert ensureProperty warning message, too many false positives in places - where Info is correctly propigated. Better approach needed. + where Info is correctly propagated. Better approach needed. -- Joey Hess Sun, 21 Dec 2014 21:41:11 -0400 diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 8a5148e9..4eed5416 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -37,7 +37,7 @@ and configured in haskell. then run on the target host, to satisfy its configured properties. A signed git commit is made by --spin, so that any changes you have made - get propigated to the target host. + get propagated to the target host. Multiple target hosts can be specified; propellor will run on each of them in sequence. diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index a8368e5d..fd790878 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -257,10 +257,10 @@ newtype PrivInfo = PrivInfo { fromPrivInfo :: S.Set (PrivDataField, Maybe PrivDataSourceDesc, HostContext) } deriving (Eq, Ord, Show, Typeable, Monoid) --- PrivInfo is propigated out of containers, so that propellor can see which +-- PrivInfo is propagated out of containers, so that propellor can see which -- hosts need it. instance IsInfo PrivInfo where - propigateInfo _ = True + propagateInfo _ = True -- | Sets the context of any privdata that uses HostContext to the -- provided name. diff --git a/src/Propellor/PropAccum.hs b/src/Propellor/PropAccum.hs index 61cf3dc8..1f9459d0 100644 --- a/src/Propellor/PropAccum.hs +++ b/src/Propellor/PropAccum.hs @@ -6,7 +6,7 @@ module Propellor.PropAccum , (&) , (&^) , (!) - , propigateContainer + , propagateContainer ) where import Data.Monoid @@ -64,17 +64,17 @@ instance PropAccum Host where -- propertyChidren the properties of the provided container. -- -- The Info of the propertyChildren is adjusted to only include --- info that should be propigated out to the Property. +-- info that should be propagated out to the Property. -- -- Any PrivInfo that uses HostContext is adjusted to use the name -- of the container as its context. -propigateContainer +propagateContainer :: (PropAccum container) => String -> container -> Property HasInfo -> Property HasInfo -propigateContainer containername c prop = infoProperty +propagateContainer containername c prop = infoProperty (propertyDesc prop) (propertySatisfy prop) (propertyInfo prop) diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index ab914180..3a108540 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -7,7 +7,7 @@ module Propellor.Property.Chroot ( provisioned, -- * Internal use provisioned', - propigateChrootInfo, + propagateChrootInfo, propellChroot, chain, ) where @@ -61,7 +61,7 @@ debootstrapped system conf location = case system of -- is first unmounted. Note that it does not ensure that any processes -- that might be running inside the chroot are stopped. provisioned :: Chroot -> RevertableProperty -provisioned c = provisioned' (propigateChrootInfo c) c False +provisioned c = provisioned' (propagateChrootInfo c) c False provisioned' :: (Property HasInfo -> Property HasInfo) -> Chroot -> Bool -> RevertableProperty provisioned' propigator c@(Chroot loc system builderconf _) systemdonly = @@ -82,8 +82,8 @@ provisioned' propigator c@(Chroot loc system builderconf _) systemdonly = teardown = toProp (revert built) -propigateChrootInfo :: (IsProp (Property i)) => Chroot -> Property i -> Property HasInfo -propigateChrootInfo c@(Chroot location _ _ _) p = propigateContainer location c p' +propagateChrootInfo :: (IsProp (Property i)) => Chroot -> Property i -> Property HasInfo +propagateChrootInfo c@(Chroot location _ _ _) p = propagateContainer location c p' where p' = infoProperty (propertyDesc p) diff --git a/src/Propellor/Property/DnsSec.hs b/src/Propellor/Property/DnsSec.hs index 22481ad0..7d1414d4 100644 --- a/src/Propellor/Property/DnsSec.hs +++ b/src/Propellor/Property/DnsSec.hs @@ -71,7 +71,7 @@ forceZoneSigned domain zonefile = property ("zone signed for " ++ domain) $ lift , "-3", salt -- The serial number needs to be increased each time the -- zone is resigned, even if there are no other changes, - -- so that it will propigate to secondaries. So, use the + -- so that it will propagate to secondaries. So, use the -- unixtime serial format. , "-N", "unixtime" , "-o", domain diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index 6aa17438..394c4271 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -119,13 +119,13 @@ container cn image = Container image (Host cn [] info) -- propellor inside the container. -- -- When the container's Properties include DNS info, such as a CNAME, --- that is propigated to the Info of the Host it's docked in. +-- that is propagated to the Info of the Host it's docked in. -- -- Reverting this property ensures that the container is stopped and -- removed. docked :: Container -> RevertableProperty docked ctr@(Container _ h) = - (propigateContainerInfo ctr (go "docked" setup)) + (propagateContainerInfo ctr (go "docked" setup)) (go "undocked" teardown) where @@ -170,8 +170,8 @@ imagePulled ctr = describe pulled msg pulled = Cmd.cmdProperty dockercmd ["pull", imageIdentifier image] image = getImageName ctr -propigateContainerInfo :: (IsProp (Property i)) => Container -> Property i -> Property HasInfo -propigateContainerInfo ctr@(Container _ h) p = propigateContainer cn ctr p' +propagateContainerInfo :: (IsProp (Property i)) => Container -> Property i -> Property HasInfo +propagateContainerInfo ctr@(Container _ h) p = propagateContainer cn ctr p' where p' = infoProperty (propertyDesc p) diff --git a/src/Propellor/Property/List.hs b/src/Propellor/Property/List.hs index a88d44d7..41451ef5 100644 --- a/src/Propellor/Property/List.hs +++ b/src/Propellor/Property/List.hs @@ -33,7 +33,7 @@ class PropertyList l where -- | Combines a list of properties, resulting in a single property -- that when run will run each property in the list in turn, -- and print out the description of each as it's run. Does not stop - -- on failure; does propigate overall success/failure. + -- on failure; does propagate overall success/failure. -- -- Note that Property HasInfo and Property NoInfo are not the same -- type, and so cannot be mixed in a list. To make a list of diff --git a/src/Propellor/Property/Spin.hs b/src/Propellor/Property/Spin.hs index ee65b0a9..ead85f59 100644 --- a/src/Propellor/Property/Spin.hs +++ b/src/Propellor/Property/Spin.hs @@ -40,7 +40,7 @@ instance Spinnable Host where noChange -- | Each Host in the list is spinned in turn. Does not stop on spin --- failure; does propigate overall success/failure. +-- failure; does propagate overall success/failure. instance Spinnable [Host] where toSpin l = propertyList (cdesc $ unwords $ map hostName l) (map toSpin l) @@ -131,7 +131,7 @@ isControlledBy :: Host -> Controlling -> Bool h `isControlledBy` (Controlled hs) = any (== hostName h) (map hostName hs) instance IsInfo Controlling where - propigateInfo _ = True + propagateInfo _ = True mkControllingInfo :: Host -> Info mkControllingInfo controlled = addInfo mempty (Controlled [controlled]) diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index fc3e0d10..ea38980b 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -212,7 +212,7 @@ newtype HostKeyInfo = HostKeyInfo deriving (Eq, Ord, Typeable) instance IsInfo HostKeyInfo where - propigateInfo _ = False + propagateInfo _ = False instance Monoid HostKeyInfo where mempty = HostKeyInfo M.empty @@ -233,7 +233,7 @@ newtype UserKeyInfo = UserKeyInfo deriving (Eq, Ord, Typeable) instance IsInfo UserKeyInfo where - propigateInfo _ = False + propagateInfo _ = False instance Monoid UserKeyInfo where mempty = UserKeyInfo M.empty diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs index a93c48bc..0ec0697e 100644 --- a/src/Propellor/Property/Systemd.hs +++ b/src/Propellor/Property/Systemd.hs @@ -216,7 +216,7 @@ nspawned c@(Container name (Chroot.Chroot loc system builderconf _) h) = -- Chroot provisioning is run in systemd-only mode, -- which sets up the chroot and ensures systemd and dbus are -- installed, but does not handle the other provisions. - chrootprovisioned = Chroot.provisioned' (Chroot.propigateChrootInfo chroot) chroot True + chrootprovisioned = Chroot.provisioned' (Chroot.propagateChrootInfo chroot) chroot True -- Use nsenter to enter container and and run propellor to -- finish provisioning. diff --git a/src/Propellor/Types/Chroot.hs b/src/Propellor/Types/Chroot.hs index d92c7070..fc049603 100644 --- a/src/Propellor/Types/Chroot.hs +++ b/src/Propellor/Types/Chroot.hs @@ -16,7 +16,7 @@ data ChrootInfo = ChrootInfo deriving (Show, Typeable) instance IsInfo ChrootInfo where - propigateInfo _ = False + propagateInfo _ = False instance Monoid ChrootInfo where mempty = ChrootInfo mempty mempty 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 diff --git a/src/Propellor/Types/Docker.hs b/src/Propellor/Types/Docker.hs index a1ed4cd9..f3cc4a52 100644 --- a/src/Propellor/Types/Docker.hs +++ b/src/Propellor/Types/Docker.hs @@ -16,7 +16,7 @@ data DockerInfo = DockerInfo deriving (Show, Typeable) instance IsInfo DockerInfo where - propigateInfo _ = False + propagateInfo _ = False instance Monoid DockerInfo where mempty = DockerInfo mempty mempty diff --git a/src/Propellor/Types/Info.hs b/src/Propellor/Types/Info.hs index 3330a033..e94c370e 100644 --- a/src/Propellor/Types/Info.hs +++ b/src/Propellor/Types/Info.hs @@ -29,13 +29,13 @@ instance Show Info where -- as info, especially type aliases which coud easily lead to bugs. -- We want a little bit of dynamic types here, but not too far.. class (Typeable v, Monoid v) => IsInfo v where - -- | Should info of this type be propigated out of a + -- | Should info of this type be propagated out of a -- container to its Host? - propigateInfo :: v -> Bool + propagateInfo :: v -> Bool -- | Any value in the `IsInfo` type class can be added to an Info. addInfo :: IsInfo v => Info -> v -> Info -addInfo (Info l) v = Info ((toDyn v, propigateInfo v):l) +addInfo (Info l) v = Info ((toDyn v, propagateInfo v):l) -- The list is reversed here because addInfo builds it up in reverse order. getInfo :: IsInfo v => Info -> v @@ -50,13 +50,13 @@ mapInfo f (Info l) = Info (map go l) Nothing -> (i, p) Just v -> (toDyn (f v), p) --- | Filters out parts of the Info that should not propigate out of a +-- | Filters out parts of the Info that should not propagate out of a -- container. propigatableInfo :: Info -> Info propigatableInfo (Info l) = Info (filter snd l) -- | Use this to put a value in Info that is not a monoid. --- The last value set will be used. This info does not propigate +-- The last value set will be used. This info does not propagate -- out of a container. data InfoVal v = NoInfoVal | InfoVal v deriving (Typeable) @@ -67,7 +67,7 @@ instance Monoid (InfoVal v) where mappend v NoInfoVal = v instance Typeable v => IsInfo (InfoVal v) where - propigateInfo _ = False + propagateInfo _ = False fromInfoVal :: InfoVal v -> Maybe v fromInfoVal NoInfoVal = Nothing -- cgit v1.2.3