summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Apache.hs
diff options
context:
space:
mode:
authorJoey Hess2015-12-06 14:33:22 -0400
committerJoey Hess2015-12-06 14:33:22 -0400
commit6c7ad5b021ae46be1fda3004f9c578ab2471d9aa (patch)
tree4319434104db22cc4598746eeb2d6fbf244ed7be /src/Propellor/Property/Apache.hs
parent616c6c2e2c2c7dcafa9bc72c7c1bdea650e43e43 (diff)
parent516b7cb886470c6a86d4022d7cf20a8547a98bd9 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Apache.hs')
-rw-r--r--src/Propellor/Property/Apache.hs15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/Propellor/Property/Apache.hs b/src/Propellor/Property/Apache.hs
index 626d3879..9e192e84 100644
--- a/src/Propellor/Property/Apache.hs
+++ b/src/Propellor/Property/Apache.hs
@@ -37,9 +37,8 @@ siteEnabled hn cf = enable <!> disable
[ siteAvailable hn cf
`requires` installed
`onChange` reloaded
- , check (not <$> isenabled) $
- cmdProperty "a2ensite" ["--quiet", hn]
- `assume` MadeChange
+ , check (not <$> isenabled)
+ (cmdProperty "a2ensite" ["--quiet", hn])
`requires` installed
`onChange` reloaded
]
@@ -63,15 +62,13 @@ siteAvailable hn cf = combineProperties ("apache site available " ++ hn) $
modEnabled :: String -> RevertableProperty NoInfo
modEnabled modname = enable <!> disable
where
- enable = check (not <$> isenabled) $
- cmdProperty "a2enmod" ["--quiet", modname]
- `assume` MadeChange
+ enable = check (not <$> isenabled)
+ (cmdProperty "a2enmod" ["--quiet", modname])
`describe` ("apache module enabled " ++ modname)
`requires` installed
`onChange` reloaded
- disable = check isenabled $
- cmdProperty "a2dismod" ["--quiet", modname]
- `assume` MadeChange
+ disable = check isenabled
+ (cmdProperty "a2dismod" ["--quiet", modname])
`describe` ("apache module disabled " ++ modname)
`requires` installed
`onChange` reloaded