summaryrefslogtreecommitdiff
path: root/Remote/Tahoe.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-06-09 15:29:16 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-06-09 15:29:16 -0400
commit2d0ee3223d25a32050f680b6b23f9ebd24d112fa (patch)
tree76d3fea59121ce4f3cba1da8eee1b2387e18f5c1 /Remote/Tahoe.hs
parentcb2a155c9f35dfed9581008dcebe8136632cc951 (diff)
tahoe: Use ~/.tahoe-git-annex/ rather than ~/.tahoe/git-annex/ to avoid old versions of tahoe create-client choking.
Diffstat (limited to 'Remote/Tahoe.hs')
-rw-r--r--Remote/Tahoe.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Tahoe.hs b/Remote/Tahoe.hs
index 4a5216194..f2649fa4b 100644
--- a/Remote/Tahoe.hs
+++ b/Remote/Tahoe.hs
@@ -9,7 +9,7 @@
- configuration, when embedcreds is enabled.
-
- Using those creds, git-annex sets up a tahoe configuration directory in
- - ~/.tahoe/git-annex/UUID/
+ - ~/.tahoe-git-annex/UUID/
-
- Tahoe has its own encryption, so git-annex's encryption is not used.
-
@@ -141,7 +141,7 @@ checkKey u hdl k = go =<< getCapability u k
defaultTahoeConfigDir :: UUID -> IO TahoeConfigDir
defaultTahoeConfigDir u = do
h <- myHomeDir
- return $ h </> ".tahoe" </> "git-annex" </> fromUUID u
+ return $ h </> ".tahoe-git-annex" </> fromUUID u
tahoeConfigure :: TahoeConfigDir -> IntroducerFurl -> Maybe SharedConvergenceSecret -> IO SharedConvergenceSecret
tahoeConfigure configdir furl mscs = do