summaryrefslogtreecommitdiff
path: root/Propellor/Property/Ssh.hs
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 23:55:59 -0400
committerJoey Hess2014-03-30 23:55:59 -0400
commit8621fa6e9983a39c07a9677eac324ebcee79b549 (patch)
treeaf60e05e58dc49d2f73d326f8ed1fb51d74f3704 /Propellor/Property/Ssh.hs
parent8f2ac23b41c6bbc24c658831a6a988c0d23a9f7d (diff)
more prep for hackage
Diffstat (limited to 'Propellor/Property/Ssh.hs')
-rw-r--r--Propellor/Property/Ssh.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/Propellor/Property/Ssh.hs b/Propellor/Property/Ssh.hs
index 39e02689..2c2c54c8 100644
--- a/Propellor/Property/Ssh.hs
+++ b/Propellor/Property/Ssh.hs
@@ -1,8 +1,9 @@
module Propellor.Property.Ssh where
-import Propellor.Common
+import Propellor
import qualified Propellor.Property.File as File
import Propellor.Property.User
+import Utility.SafeCommand
sshBool :: Bool -> String
sshBool True = "yes"
@@ -35,7 +36,7 @@ hasAuthorizedKeys = go <=< homedir
(readFile $ home </> ".ssh" </> "authorized_keys")
restartSshd :: Property
-restartSshd = cmdProperty "service" [Param "ssh", Param "restart"]
+restartSshd = cmdProperty "service" ["ssh", "restart"]
{- | Blow away existing host keys and make new ones. Use a flag
- file to prevent doing this more than once. -}
@@ -50,4 +51,4 @@ uniqueHostKeys = flagFile prop "/etc/ssh/.unique_host_keys"
]
ensureProperty $
cmdProperty "/var/lib/dpkg/info/openssh-server.postinst"
- [Param "configure"]
+ ["configure"]