diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-01-25 15:16:58 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-25 15:16:58 -0400 |
| commit | 401b857eef13ca7d3f7b8f6b88e9237884fcd906 (patch) | |
| tree | eb4b5c189349b5a86b3b39edbe039956d3a1a3b8 /src/Propellor/Property/Prosody.hs | |
| parent | 1df70ba81ddfbd4ceeb5344793f7714a35706c8f (diff) | |
| parent | cdd88b080af534231aae8a64ef327f0597a5b5b3 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
doc/todo/info_propigation_out_of_nested_properties.mdwn
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/Prosody.hs')
| -rw-r--r-- | src/Propellor/Property/Prosody.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/Prosody.hs b/src/Propellor/Property/Prosody.hs index 06e2355f..31b6a624 100644 --- a/src/Propellor/Property/Prosody.hs +++ b/src/Propellor/Property/Prosody.hs @@ -11,7 +11,7 @@ type ConfigFile = [String] type Conf = String confEnabled :: Conf -> ConfigFile -> RevertableProperty -confEnabled conf cf = RevertableProperty enable disable +confEnabled conf cf = enable <!> disable where enable = check test prop `describe` ("prosody conf enabled " ++ conf) @@ -30,7 +30,7 @@ confEnabled conf cf = RevertableProperty enable disable `requires` installed `onChange` reloaded -confAvailable :: Conf -> ConfigFile -> Property +confAvailable :: Conf -> ConfigFile -> Property NoInfo confAvailable conf cf = ("prosody conf available " ++ conf) ==> confAvailPath conf `File.hasContent` (comment : cf) where @@ -42,11 +42,11 @@ confAvailPath conf = "/etc/prosody/conf.avail" </> conf <.> "cfg.lua" confValPath :: Conf -> FilePath confValPath conf = "/etc/prosody/conf.d" </> conf <.> "cfg.lua" -installed :: Property +installed :: Property NoInfo installed = Apt.installed ["prosody"] -restarted :: Property +restarted :: Property NoInfo restarted = Service.restarted "prosody" -reloaded :: Property +reloaded :: Property NoInfo reloaded = Service.reloaded "prosody" |