summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-13 16:54:24 -0400
committerJoey Hess2014-04-13 16:54:24 -0400
commit414b0dffec57d259d761965b5b5da3bfb57b1a80 (patch)
treeddcd2581442ef0508001fad1314d6b3e75a00e1e
parenta9151250f2cb8d37f45506d96e8370ddf2103dce (diff)
propellor spin
-rw-r--r--Propellor/CmdLine.hs2
-rw-r--r--config-joey.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index b58179f2..5be91c4f 100644
--- a/Propellor/CmdLine.hs
+++ b/Propellor/CmdLine.hs
@@ -174,7 +174,7 @@ spin hn = do
cacheparams <- toCommand <$> sshCachingParams hn
go cacheparams url =<< gpgDecrypt (privDataFile hn)
where
- go cacheparams url privdata = withBothHandles createProcessSuccess (proc "ssh" $ cacheparams ++ ["-t", user, bootstrapcmd]) $ \(toh, fromh) -> do
+ go cacheparams url privdata = withBothHandles createProcessSuccess (proc "ssh" $ cacheparams ++ [user, bootstrapcmd]) $ \(toh, fromh) -> do
let finish = do
senddata toh (privDataFile hn) privDataMarker privdata
hClose toh
diff --git a/config-joey.hs b/config-joey.hs
index 67296bcb..ab878fb2 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -81,7 +81,7 @@ hosts =
& JoeySites.gitServer hosts
& cname "downloads.kitenet.net"
- & JoeySites.annexWebSite "/srv/git/download.git"
+ & JoeySites.annexWebSite "/srv/git/downloads.git"
"downloads.kitenet.net"
"840760dc-08f0-11e2-8c61-576b7e66acfd"
[("turtle", "ssh://turtle.kitenet.net/~/lib/downloads/")]