summaryrefslogtreecommitdiff
path: root/Propellor.hs
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 15:53:35 -0400
committerJoey Hess2014-03-30 15:53:35 -0400
commita2a3d3f3a252e64d80421b5a14ef572a7bdf9e4a (patch)
tree98ba2b94f011824e591bee66b3f113c52061f48a /Propellor.hs
parent90efcd3203d64c2c5691e30ccc23307aae8d20c8 (diff)
better descriptions for properties
Diffstat (limited to 'Propellor.hs')
-rw-r--r--Propellor.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Propellor.hs b/Propellor.hs
index 9e50b2f6..dc5185d0 100644
--- a/Propellor.hs
+++ b/Propellor.hs
@@ -45,10 +45,11 @@ standardSystem suite = propertyList "standard system"
, check (Ssh.hasAuthorizedKeys "root") $
User.lockedPassword "root"
, Apt.installed ["vim"]
- , User.nonsystem "joey"
+ , User.sshAccountFor "joey"
, Apt.installed ["sudo"]
-- nopasswd because no password is set up for joey.
, "/etc/sudoers" `File.containsLine` "joey ALL=(ALL:ALL) NOPASSWD:ALL"
+ `describe` "sudoer joey"
, GitHome.installedFor "joey"
]
@@ -59,10 +60,10 @@ cleanCloudAtCost hostname = propertyList "cloudatcost cleanup"
, Apt.removed ["exim4"] `onChange` Apt.autoRemove
, Hostname.set hostname
, Ssh.uniqueHostKeys
- -- Work around for #612402
, "/etc/default/grub" `File.containsLine` "GRUB_DISABLE_LINUX_UUID=true"
`onChange` cmdProperty "update-grub" []
`onChange` cmdProperty "update-initramfs" [Param "-u"]
+ `describe` "work around grub/lvm boot bug #743126"
-- Cruft
, File.notPresent "/etc/rc.local"
, File.notPresent "/etc/init.d/S97-setup.sh"