From ef9abb9b676f80b3e079a429f55a0319f6efdb8d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 31 Oct 2014 17:47:52 -0400
Subject: [PATCH] Apache: Fix daemon reload when enabling a new module or site.

---
 debian/changelog                 |  1 +
 src/Propellor/Property/Apache.hs | 36 +++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 804d54c..5b45c85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ propellor (0.9.2) UNRELEASED; urgency=medium
 
   * Added nginx module, contributed by Félix Sipma.
   * Added firewall module, contributed by Arnaud Bailly.
+  * Apache: Fix daemon reload when enabling a new module or site.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 30 Oct 2014 16:36:06 -0400
 
diff --git a/src/Propellor/Property/Apache.hs b/src/Propellor/Property/Apache.hs
index 175e196..1d9c35c 100644
--- a/src/Propellor/Property/Apache.hs
+++ b/src/Propellor/Property/Apache.hs
@@ -4,23 +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 Utility.SafeCommand
 
 type ConfigFile = [String]
 
 siteEnabled :: HostName -> ConfigFile -> RevertableProperty
 siteEnabled hn cf = RevertableProperty enable disable
   where
-	enable = trivial (cmdProperty "a2ensite" ["--quiet", hn])
-		`describe` ("apache site enabled " ++ hn)
-		`requires` siteAvailable hn cf
-		`requires` installed
-		`onChange` reloaded
-	disable = trivial $ combineProperties
+	enable = check (not <$> isenabled) $
+		cmdProperty "a2ensite" ["--quiet", hn]
+			`describe` ("apache site enabled " ++ hn)
+			`requires` siteAvailable hn cf
+			`requires` installed
+			`onChange` reloaded
+	disable = combineProperties
 		("apache site disabled " ++ hn) 
 		(map File.notPresent (siteCfg hn))
 		`onChange` cmdProperty "a2dissite" ["--quiet", hn]
 		`requires` installed
 		`onChange` reloaded
+	isenabled = boolSystem "a2query" [Param "-q", Param "-s", Param hn]
 
 siteAvailable :: HostName -> ConfigFile -> Property
 siteAvailable hn cf = combineProperties ("apache site available " ++ hn) $
@@ -31,17 +34,20 @@ siteAvailable hn cf = combineProperties ("apache site available " ++ hn) $
 modEnabled :: String -> RevertableProperty
 modEnabled modname = RevertableProperty enable disable
   where
-	enable = trivial $ cmdProperty "a2enmod" ["--quiet", modname]
-		`describe` ("apache module enabled " ++ modname)
-		`requires` installed
-		`onChange` reloaded
-	disable = trivial $ cmdProperty "a2dismod" ["--quiet", modname]
-		`describe` ("apache module disabled " ++ modname)
-		`requires` installed
-		`onChange` reloaded
+	enable = check (not <$> isenabled) $
+		cmdProperty "a2enmod" ["--quiet", modname]
+			`describe` ("apache module enabled " ++ modname)
+			`requires` installed
+			`onChange` reloaded
+	disable = check isenabled $ 
+		cmdProperty "a2dismod" ["--quiet", modname]
+			`describe` ("apache module disabled " ++ modname)
+			`requires` installed
+			`onChange` reloaded
+	isenabled = boolSystem "a2query" [Param "-q", Param "-m", Param modname]
 
 -- This is a list of config files because different versions of apache
--- use different filenames. Propellor simply writen them all.
+-- use different filenames. Propellor simply writes them all.
 siteCfg :: HostName -> [FilePath]
 siteCfg hn =
 	-- Debian pre-2.4