diff options
| author | Joey Hess <joeyh@joeyh.name> | 2014-12-09 00:34:24 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-09 00:34:24 -0400 |
| commit | b22201e36b608ba38f4d741268d04e7de3a966b8 (patch) | |
| tree | 1256a0e4df4c79a3ddfb9a8c60657155c9ba01eb /src | |
| parent | f8943c2036d91585f7afc3140b2442e7e78c284f (diff) | |
Fix Apache.siteEnabled to update the config file and reload apache when configuration has changed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Apache.hs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/Propellor/Property/Apache.hs b/src/Propellor/Property/Apache.hs index 1d9c35ce..1ce187d8 100644 --- a/src/Propellor/Property/Apache.hs +++ b/src/Propellor/Property/Apache.hs @@ -11,12 +11,15 @@ type ConfigFile = [String] siteEnabled :: HostName -> ConfigFile -> RevertableProperty siteEnabled hn cf = RevertableProperty enable disable where - enable = check (not <$> isenabled) $ - cmdProperty "a2ensite" ["--quiet", hn] - `describe` ("apache site enabled " ++ hn) - `requires` siteAvailable hn cf + enable = combineProperties ("apache site enabled " ++ hn) + [ siteAvailable hn cf `requires` installed `onChange` reloaded + , check (not <$> isenabled) $ + cmdProperty "a2ensite" ["--quiet", hn] + `requires` installed + `onChange` reloaded + ] disable = combineProperties ("apache site disabled " ++ hn) (map File.notPresent (siteCfg hn)) |