diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-06-03 12:17:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-06-03 12:17:56 -0400 |
| commit | 5d3408d32292402ccd69bfadb3c28937a96eda5d (patch) | |
| tree | 24c10a1a53d0e85f4699bc18e377764598c0536d /src/Propellor/Ssh.hs | |
| parent | ce0e1a6dc82acb7fd8e64a9ec4c6ff0acf87e241 (diff) | |
| parent | fd9d172bcd9f217b67a60ed2e694bad4f6602d32 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Ssh.hs')
| -rw-r--r-- | src/Propellor/Ssh.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/Ssh.hs b/src/Propellor/Ssh.hs index ac9295d1..3fe78f7a 100644 --- a/src/Propellor/Ssh.hs +++ b/src/Propellor/Ssh.hs @@ -22,7 +22,8 @@ sshCachingParams hn = do let ps = [ Param "-o" , Param ("ControlPath=" ++ socketfile) - , Params "-o ControlMaster=auto -o ControlPersist=yes" + , Param "-o", Param "ControlMaster=auto" + , Param "-o", Param "ControlPersist=yes" ] maybe noop (expireold ps socketfile) @@ -37,7 +38,7 @@ sshCachingParams hn = do then touchFile f else do void $ boolSystem "ssh" $ - [ Params "-O stop" ] ++ ps ++ + [ Param "-O", Param "stop" ] ++ ps ++ [ Param "localhost" ] nukeFile f tenminutes = 600 |