summaryrefslogtreecommitdiff
path: root/Propellor.hs
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 16:53:31 -0400
committerJoey Hess2014-03-30 16:53:31 -0400
commit4e442f4bcf04a68f638393d180ac7664ddd0fe4b (patch)
tree064deea7852a91e39d57cd7a6b31f4bccb5de793 /Propellor.hs
parent1dcaeb6f776eaf401b1dbe68f836ec3d5953bb0c (diff)
tweaks
Diffstat (limited to 'Propellor.hs')
-rw-r--r--Propellor.hs13
1 files changed, 6 insertions, 7 deletions
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
+ ]
]