diff options
| author | Joey Hess <joey@kitenet.net> | 2014-03-30 19:22:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-30 19:22:10 -0400 |
| commit | 2172ba82ffac7ab0de49f8c39f34b1bff39c025e (patch) | |
| tree | f258bda9b26da9d677829a6308d950e8ae87ab99 | |
| parent | 808392f21e7bfb36358a483e9e05f297859ba55d (diff) | |
propellor spin
| -rw-r--r-- | Propellor.hs | 2 | ||||
| -rw-r--r-- | Property/User.hs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Propellor.hs b/Propellor.hs index 01671786..d78b61c3 100644 --- a/Propellor.hs +++ b/Propellor.hs @@ -19,6 +19,8 @@ getProperties :: HostName -> [Property] getProperties hostname@"clam.kitenet.net" = [ cleanCloudAtCost hostname , standardSystem Apt.Unstable + , hasPassword "root" + , hasPassword "joey" -- Clam is a tor bridge. , Tor.isBridge , Apt.installed ["docker.io"] diff --git a/Property/User.hs b/Property/User.hs index dcbf56c9..661a6f8a 100644 --- a/Property/User.hs +++ b/Property/User.hs @@ -22,8 +22,8 @@ nuked user _ = check (isJust <$> homedir user) $ cmdProperty "userdel" ] `describe` ("nuked user " ++ user) -setPassword :: UserName -> Property -setPassword user = Property (user ++ " password set") $ +hasPassword :: UserName -> Property +hasPassword user = Property (user ++ " has password") $ withPrivData (Password user) $ \password -> makeChange $ withHandle StdinHandle createProcessSuccess (proc "chpasswd" []) $ \h -> do |