summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-01-04 17:15:29 -0400
committerJoey Hess2015-01-04 17:15:59 -0400
commitab8ff9a00e76d3cc395136d3c676286aae28eb19 (patch)
tree2d37a531714e69010bb8350b0602ac1a6c7f4680
parentfd1e01c853d9aff6435b3421f4134a63144fa2b5 (diff)
randomHostKeys is removed from CloudAtCost.deCruft.
-rw-r--r--config-joey.hs1
-rw-r--r--debian/changelog1
-rw-r--r--src/Propellor/Property/HostingProvider/CloudAtCost.hs1
3 files changed, 2 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 18bdf99e..d81a18c6 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -94,6 +94,7 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64"
& ipv4 "167.88.41.194"
& CloudAtCost.decruft
+ & Ssh.randomHostKeys
& Apt.unattendedUpgrades
& Network.ipv6to4
& Tor.isBridge
diff --git a/debian/changelog b/debian/changelog
index 63089cbc..6bcee3eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ propellor (1.3.0) UNRELEASED; urgency=medium
configured to have.
* sshPubKey is renamed to Ssh.pubKey, and has an added SshKeyType
parameter. (API change)
+ * CloudAtCost.deCruft no longer forces randomHostKeys.
* Fix build with process 1.2.1.0.
-- Joey Hess <id@joeyh.name> Thu, 01 Jan 2015 13:27:23 -0400
diff --git a/src/Propellor/Property/HostingProvider/CloudAtCost.hs b/src/Propellor/Property/HostingProvider/CloudAtCost.hs
index cce80920..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" []