diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-15 15:08:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-15 15:08:40 -0400 |
| commit | ba058d77a778058887f5c678b10e3c5ac599c50c (patch) | |
| tree | f841754cb52d41ccafee719a1fc0b47c766ad7b2 /Propellor/Property/Apache.hs | |
| parent | a1e3c4e9e060c58a738501030a197557e20e88db (diff) | |
| parent | 0592ab4bd7deaadaa971bc7d19b7beaca5a1253e (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'Propellor/Property/Apache.hs')
| -rw-r--r-- | Propellor/Property/Apache.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Propellor/Property/Apache.hs b/Propellor/Property/Apache.hs index f45ef9df..cf3e62cc 100644 --- a/Propellor/Property/Apache.hs +++ b/Propellor/Property/Apache.hs @@ -10,12 +10,12 @@ type ConfigFile = [String] siteEnabled :: HostName -> ConfigFile -> RevertableProperty siteEnabled hn cf = RevertableProperty enable disable where - enable = cmdProperty "a2ensite" ["--quiet", hn] + enable = trivial $ cmdProperty "a2ensite" ["--quiet", hn] `describe` ("apache site enabled " ++ hn) `requires` siteAvailable hn cf `requires` installed `onChange` reloaded - disable = File.notPresent (siteCfg hn) + disable = trivial $ File.notPresent (siteCfg hn) `describe` ("apache site disabled " ++ hn) `onChange` cmdProperty "a2dissite" ["--quiet", hn] `requires` installed @@ -30,11 +30,11 @@ siteAvailable hn cf = siteCfg hn `File.hasContent` (comment:cf) modEnabled :: String -> RevertableProperty modEnabled modname = RevertableProperty enable disable where - enable = cmdProperty "a2enmod" ["--quiet", modname] + enable = trivial $ cmdProperty "a2enmod" ["--quiet", modname] `describe` ("apache module enabled " ++ modname) `requires` installed `onChange` reloaded - disable = cmdProperty "a2dismod" ["--quiet", modname] + disable = trivial $ cmdProperty "a2dismod" ["--quiet", modname] `describe` ("apache module disabled " ++ modname) `requires` installed `onChange` reloaded |