summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-10-16 14:40:36 -0400
committerJoey Hess2015-10-16 14:40:36 -0400
commit769ccb3deee313fb9d9369221be9097112a76800 (patch)
tree0ae7e59d509a5e5540ce2f269d820c9ed78edd82
parent70a582863f5200388cc7ff1a6f32ca4d8a09531c (diff)
parent1382d4ecb9076f9fffc36f8a12dc068e43acc13e (diff)
Merge branch 'joeyconfig'
-rw-r--r--src/Propellor/Property/Spin.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/Spin.hs b/src/Propellor/Property/Spin.hs
index 24b8a3b6..d590e319 100644
--- a/src/Propellor/Property/Spin.hs
+++ b/src/Propellor/Property/Spin.hs
@@ -8,13 +8,13 @@ import Propellor.Types.CmdLine (ControllerChain(..))
import Propellor.Types.Info
class Controlled t where
- toHosts :: t -> [Host]
+ controlledHosts :: t -> [Host]
instance Controlled Host where
- toHosts h = [h]
+ controlledHosts h = [h]
instance Controlled [Host] where
- toHosts = id
+ controlledHosts = id
-- | The Host that has this Property is in control of some other Hosts.
--
@@ -31,7 +31,7 @@ instance Controlled [Host] where
-- Chains of controllers are supported; host A can control host B which
-- controls host C. Loops of controllers are automatically prevented.
controller :: Controlled h => h -> Property NoInfo
-controller h = propertyList "controller" (map controller' (toHosts h))
+controller h = propertyList "controller" (map controller' (controlledHosts h))
controller' :: Host -> Property NoInfo
controller' h = property ("controller for " ++ hostName h) $ do