summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Service.hs
diff options
context:
space:
mode:
authorJoey Hess2017-11-17 22:31:09 -0400
committerJoey Hess2017-11-17 22:31:09 -0400
commit12db085fe8474e089fdb888ece26bbedec8e9be1 (patch)
tree4815dc7f5a284ad8aedb31703635451bcb9d48f5 /src/Propellor/Property/Service.hs
parent375eae7e8c424ef837cedac6e309381d58ea32e1 (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property/Service.hs')
-rw-r--r--src/Propellor/Property/Service.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/Property/Service.hs b/src/Propellor/Property/Service.hs
index 0bcfdb93..1c230ce0 100644
--- a/src/Propellor/Property/Service.hs
+++ b/src/Propellor/Property/Service.hs
@@ -26,7 +26,8 @@ reloaded :: ServiceName -> Property DebianLike
reloaded = signaled "reload" "reloaded"
signaled :: String -> Desc -> ServiceName -> Property DebianLike
-signaled cmd desc svc = tightenTargets $ p `describe` (desc ++ " " ++ svc)
+signaled cmd desc svc = check (not <$> servicesDisabled) $
+ tightenTargets $ p `describe` (desc ++ " " ++ svc)
where
p = scriptProperty ["service " ++ shellEscape svc ++ " " ++ cmd ++ " >/dev/null 2>&1 || true"]
`assume` NoChange
@@ -51,8 +52,8 @@ noServices = (setup `setInfoProperty` toInfo (InfoVal NoServices)) <!> teardown
teardown = File.notPresent f
-- | Check if the noServices property is in effect.
-checkNoServices :: Propellor Bool
-checkNoServices = isJust . fromInfoVal
+servicesDisabled :: Propellor Bool
+servicesDisabled = isJust . fromInfoVal
<$> (askInfo :: Propellor (InfoVal NoServices))
data NoServices = NoServices deriving (Eq, Show, Typeable)