diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-10 11:40:12 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-10 11:40:12 -0400 |
| commit | 349e675a499187379ddb14c5f6ce8203de10183e (patch) | |
| tree | 44f9eed959335dca27bb35947a952c3ca9f97efb /src/Propellor/Property | |
| parent | ea29beecfeebf304e544ab588da43fa66d83fd43 (diff) | |
Improved documentation, particularly of the Propellor module.
This involved some code changes, including some renaming of instance
methods. (ABI change)
Diffstat (limited to 'src/Propellor/Property')
| -rw-r--r-- | src/Propellor/Property/Chroot.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Property/Docker.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Property/Systemd.hs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index b059e3eb..aecf33ec 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -34,8 +34,8 @@ data BuilderConf deriving (Show) instance PropAccum Chroot where - (Chroot l s c h) & p = Chroot l s c (h & p) - (Chroot l s c h) &^ p = Chroot l s c (h &^ p) + (Chroot l s c h) `addProp` p = Chroot l s c (h & p) + (Chroot l s c h) `addPropFront` p = Chroot l s c (h `addPropFront` p) getProperties (Chroot _ _ _ h) = hostProperties h -- | Defines a Chroot at the given location, built with debootstrap. diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index e6365276..c3a1de72 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -97,8 +97,8 @@ instance HasImage Container where getImageName (Container i _) = i instance PropAccum Container where - (Container i h) & p = Container i (h & p) - (Container i h) &^ p = Container i (h &^ p) + (Container i h) `addProp` p = Container i (h `addProp` p) + (Container i h) `addPropFront` p = Container i (h `addPropFront` p) getProperties (Container _ h) = hostProperties h -- | Defines a Container with a given name, image, and properties. diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs index e44ef717..d816ab6c 100644 --- a/src/Propellor/Property/Systemd.hs +++ b/src/Propellor/Property/Systemd.hs @@ -62,8 +62,8 @@ data Container = Container MachineName Chroot.Chroot Host deriving (Show) instance PropAccum Container where - (Container n c h) & p = Container n c (h & p) - (Container n c h) &^ p = Container n c (h &^ p) + (Container n c h) `addProp` p = Container n c (h `addProp` p) + (Container n c h) `addPropFront` p = Container n c (h `addPropFront` p) getProperties (Container _ _ h) = hostProperties h -- | Starts a systemd service. |