From 4e442f4bcf04a68f638393d180ac7664ddd0fe4b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 30 Mar 2014 16:53:31 -0400
Subject: tweaks

---
 Propellor.hs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'Propellor.hs')

diff --git a/Propellor.hs b/Propellor.hs
index ad838a1b..421df2c4 100644
--- a/Propellor.hs
+++ b/Propellor.hs
@@ -61,16 +61,15 @@ standardSystem suite = propertyList "standard system"
 -- Clean up a system as installed by cloudatcost.com
 cleanCloudAtCost :: HostName -> Property
 cleanCloudAtCost hostname = propertyList "cloudatcost cleanup"
-	[ User.nuked "user"
-	, Hostname.set hostname
+	[ Hostname.set hostname
 	, Ssh.uniqueHostKeys
 	, "worked around grub/lvm boot bug #743126" ==>
 		"/etc/default/grub" `File.containsLine` "GRUB_DISABLE_LINUX_UUID=true"
 		`onChange` cmdProperty "update-grub" []
 		`onChange` cmdProperty "update-initramfs" [Param "-u"]
-	, "nuked cloudatcost cruft" ==>
-		combineProperties
-			[ File.notPresent "/etc/rc.local"
-			, File.notPresent "/etc/init.d/S97-setup.sh"
-			]
+	, "nuked cloudatcost cruft" ==> combineProperties
+		[ File.notPresent "/etc/rc.local"
+		, File.notPresent "/etc/init.d/S97-setup.sh"
+		, User.nuked "user" User.YesReallyDeleteHome
+		]
 	]
-- 
cgit v1.3-2-g0d8e