diff options
| author | Felix Gruber <felgru@gmx.de> | 2015-10-18 17:11:50 +0200 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-18 14:14:07 -0400 |
| commit | 2ad09b34ecec5a643a4a08c88a0a1cc7703094e3 (patch) | |
| tree | 621ece48e772504492237e1b902c18062790b94b /src/Propellor/Property | |
| parent | 57f4eca88a1c3762b452171ee0a9d1a4f1367402 (diff) | |
fix typo: propigate → propagate
Diffstat (limited to 'src/Propellor/Property')
| -rw-r--r-- | src/Propellor/Property/Chroot.hs | 8 | ||||
| -rw-r--r-- | src/Propellor/Property/DnsSec.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Docker.hs | 8 | ||||
| -rw-r--r-- | src/Propellor/Property/List.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Spin.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Property/Ssh.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Property/Systemd.hs | 2 |
7 files changed, 15 insertions, 15 deletions
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. |
