summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorFélix Sipma2014-10-31 20:13:37 +0100
committerJoey Hess2014-10-31 17:36:33 -0400
commit784210a57398c37d7517ef4636696139c0ec99ea (patch)
tree0e23b1d6370a4f1a9b480833815e6db67edb3371 /src/Propellor
parent5a6ff0b0f35831e3c8258f5a3407c97089e715ed (diff)
Propellor.Property.Nginx: use System.Posix.Files
Bug: the "onChange reloaded" in siteEnabled does not seem to be fired... Does it works in Propellor.Property.Apache.siteEnabled? Signed-off-by: Félix Sipma <gueux@gueux.org>
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/Nginx.hs15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/Propellor/Property/Nginx.hs b/src/Propellor/Property/Nginx.hs
index 97792fcc..397570d2 100644
--- a/src/Propellor/Property/Nginx.hs
+++ b/src/Propellor/Property/Nginx.hs
@@ -4,21 +4,26 @@ import Propellor
import qualified Propellor.Property.File as File
import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.Service as Service
+import System.Posix.Files
type ConfigFile = [String]
siteEnabled :: HostName -> ConfigFile -> RevertableProperty
siteEnabled hn cf = RevertableProperty enable disable
where
- enable = trivial (cmdProperty "ln" ["-s", siteValRelativeCfg hn, siteVal hn])
+ enable = check test prop
`describe` ("nginx site enabled " ++ hn)
`requires` siteAvailable hn cf
`requires` installed
`onChange` reloaded
- disable = trivial $
- ("nginx site disabled " ++ hn) ==>
- File.notPresent (siteCfg hn)
- `onChange` cmdProperty "rm" [siteVal hn]
+ where
+ test = not <$> doesFileExist (siteVal hn)
+ prop = property "nginx site in place" $ makeChange $
+ createSymbolicLink target dir
+ target = siteValRelativeCfg hn
+ dir = siteVal hn
+ disable = trivial $ File.notPresent (siteVal hn)
+ `describe` ("nginx site disable" ++ hn)
`requires` installed
`onChange` reloaded