Merge branch 'joeyconfig'

3 files changed, 29 insertions, 24 deletions

diff --git a/src/Propellor/Property/HostingProvider/CloudAtCost.hs b/src/Propellor/Property/HostingProvider/CloudAtCost.hs
index bfe3ae17..5c4788e2 100644
--- a/src/Propellor/Property/HostingProvider/CloudAtCost.hs
+++ b/src/Propellor/Property/HostingProvider/CloudAtCost.hs
@@ -6,19 +6,24 @@ import qualified Propellor.Property.File as File
 import qualified Propellor.Property.User as User
 
 -- Clean up a system as installed by cloudatcost.com
-decruft :: Property NoInfo
-decruft = propertyList "cloudatcost cleanup"
-	[ Hostname.sane
-	, "worked around grub/lvm boot bug #743126" ==>
+decruft :: Property DebianLike
+decruft = propertyList "cloudatcost cleanup" $ props
+	& Hostname.sane
+	& grubbugfix
+	& nukecruft
+  where
+	grubbugfix :: Property DebianLike
+	grubbugfix = tightenTargets $ 
 		"/etc/default/grub" `File.containsLine` "GRUB_DISABLE_LINUX_UUID=true"
-		`onChange` (cmdProperty "update-grub" [] `assume` MadeChange)
-		`onChange` (cmdProperty "update-initramfs" ["-u"] `assume` MadeChange)
-	, combineProperties "nuked cloudatcost cruft"
-		[ File.notPresent "/etc/rc.local"
-		, File.notPresent "/etc/init.d/S97-setup.sh"
-		, File.notPresent "/zang-debian.sh"
-		, File.notPresent "/bin/npasswd"
-		, User.nuked (User "user") User.YesReallyDeleteHome
-		]
-	]
+			`describe` "worked around grub/lvm boot bug #743126"
+			`onChange` (cmdProperty "update-grub" [] `assume` MadeChange)
+			`onChange` (cmdProperty "update-initramfs" ["-u"] `assume` MadeChange)
+	nukecruft :: Property Linux
+	nukecruft = tightenTargets $
+		combineProperties "nuked cloudatcost cruft" $ props
+			& File.notPresent "/etc/rc.local"
+			& File.notPresent "/etc/init.d/S97-setup.sh"
+			& File.notPresent "/zang-debian.sh"
+			& File.notPresent "/bin/npasswd"
+			& User.nuked (User "user") User.YesReallyDeleteHome
 
diff --git a/src/Propellor/Property/HostingProvider/DigitalOcean.hs b/src/Propellor/Property/HostingProvider/DigitalOcean.hs
index f49b86b3..c1e0ffc9 100644
--- a/src/Propellor/Property/HostingProvider/DigitalOcean.hs
+++ b/src/Propellor/Property/HostingProvider/DigitalOcean.hs
@@ -18,16 +18,15 @@ import Data.List
 -- If the power is cycled, the non-distro kernel still boots up.
 -- So, this property also checks if the running kernel is present in /boot,
 -- and if not, reboots immediately into a distro kernel.
-distroKernel :: Property NoInfo
-distroKernel = propertyList "digital ocean distro kernel hack"
-	[ Apt.installed ["grub-pc", "kexec-tools", "file"]
-	, "/etc/default/kexec" `File.containsLines`
+distroKernel :: Property DebianLike
+distroKernel = propertyList "digital ocean distro kernel hack" $ props
+	& Apt.installed ["grub-pc", "kexec-tools", "file"]
+	& "/etc/default/kexec" `File.containsLines`
 		[ "LOAD_KEXEC=true"
 		, "USE_GRUB_CONFIG=true"
 		] `describe` "kexec configured"
-	, check (not <$> runningInstalledKernel) Reboot.now
+	& check (not <$> runningInstalledKernel) Reboot.now
 		`describe` "running installed kernel"
-	]
 
 runningInstalledKernel :: IO Bool
 runningInstalledKernel = do
diff --git a/src/Propellor/Property/HostingProvider/Linode.hs b/src/Propellor/Property/HostingProvider/Linode.hs
index 274412a0..71719d87 100644
--- a/src/Propellor/Property/HostingProvider/Linode.hs
+++ b/src/Propellor/Property/HostingProvider/Linode.hs
@@ -8,12 +8,13 @@ import Utility.FileMode
 -- | Linode's pv-grub-x86_64 does not currently support booting recent
 -- Debian kernels compressed with xz. This sets up pv-grub chaining to enable
 -- it.
-chainPVGrub :: Grub.TimeoutSecs -> Property NoInfo
+chainPVGrub :: Grub.TimeoutSecs -> Property DebianLike
 chainPVGrub = Grub.chainPVGrub "hd0" "xen/xvda"
 
 -- | Linode disables mlocate's cron job's execute permissions,
 -- presumably to avoid disk IO. This ensures it's executable.
-mlocateEnabled :: Property NoInfo
-mlocateEnabled = "/etc/cron.daily/mlocate"
-	`File.mode` combineModes (readModes ++ executeModes)
+mlocateEnabled :: Property DebianLike
+mlocateEnabled = tightenTargets $
+	"/etc/cron.daily/mlocate"
+		`File.mode` combineModes (readModes ++ executeModes)