summaryrefslogtreecommitdiff
path: root/Propellor.hs
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 20:46:31 -0400
committerJoey Hess2014-03-30 20:46:31 -0400
commit1c65b86f8302cd42152e26c9d4fd24285a8e70c0 (patch)
treedf3554173dcdf92baf9c7f9ff458f6a97ee4a62b /Propellor.hs
parenta920555ed1da6a8608781a80cbe0fdae6f075b03 (diff)
propellor spin
Diffstat (limited to 'Propellor.hs')
-rw-r--r--Propellor.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/Propellor.hs b/Propellor.hs
index 2b7f978e..6870ca56 100644
--- a/Propellor.hs
+++ b/Propellor.hs
@@ -3,6 +3,7 @@ import CmdLine
import qualified Property.File as File
import qualified Property.Apt as Apt
import qualified Property.Ssh as Ssh
+import qualified Property.Sudo as Sudo
import qualified Property.User as User
import qualified Property.Hostname as Hostname
import qualified Property.Reboot as Reboot
@@ -48,11 +49,8 @@ standardSystem suite = propertyList "standard system"
, check (Ssh.hasAuthorizedKeys "root") $
Ssh.passwordAuthentication False
, User.sshAccountFor "joey"
- , Apt.installed ["sudo"]
- -- nopasswd because no password is set up for joey.
- , "sudoer joey" ==>
- "/etc/sudoers" `File.containsLine` "joey ALL=(ALL:ALL) NOPASSWD:ALL"
, User.hasSomePassword "joey"
+ , Sudo.enabledFor "joey"
, GitHome.installedFor "joey"
, Apt.installed ["vim", "screen"]
-- I use postfix, or no MTA.