summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/HostingProvider/CloudAtCost.hs
diff options
context:
space:
mode:
authorJoey Hess2015-01-04 17:16:55 -0400
committerJoey Hess2015-01-04 17:16:55 -0400
commitacdcff5ca48aeb08cb0b06621cf9889e1c628a86 (patch)
treec57102d12541ec2be0c25bbaddeb8644a0cdeaf8 /src/Propellor/Property/HostingProvider/CloudAtCost.hs
parenta9163ba3ab5e59b93dc901959b43c05e3fe6498a (diff)
parentdf8d8eb5328b19dcde123d46d6cd9db0e2df88e9 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/HostingProvider/CloudAtCost.hs')
-rw-r--r--src/Propellor/Property/HostingProvider/CloudAtCost.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/HostingProvider/CloudAtCost.hs b/src/Propellor/Property/HostingProvider/CloudAtCost.hs
index 003bd3c5..f45a4aa8 100644
--- a/src/Propellor/Property/HostingProvider/CloudAtCost.hs
+++ b/src/Propellor/Property/HostingProvider/CloudAtCost.hs
@@ -10,7 +10,6 @@ import qualified Propellor.Property.User as User
decruft :: Property
decruft = propertyList "cloudatcost cleanup"
[ Hostname.sane
- , Ssh.randomHostKeys
, "worked around grub/lvm boot bug #743126" ==>
"/etc/default/grub" `File.containsLine` "GRUB_DISABLE_LINUX_UUID=true"
`onChange` cmdProperty "update-grub" []
@@ -18,6 +17,7 @@ decruft = propertyList "cloudatcost cleanup"
, combineProperties "nuked cloudatcost cruft"
[ File.notPresent "/etc/rc.local"
, File.notPresent "/etc/init.d/S97-setup.sh"
+ , File.notPresent "/zang-debian.sh"
, User.nuked "user" User.YesReallyDeleteHome
]
]