summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-10-22 13:56:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-10-22 13:56:14 -0400
commit26238a3bb323e8e2cc492f6ed39557f2fffa7c75 (patch)
tree5d3e506804bd9bf6349adebf65cbb964407af268 /Remote
parent96dd75b46029a2c0759cca51f8ebefe7fa6dead9 (diff)
include creds info for glacier and webdav
That and S3 are all that uses creds currently, except that external remotes can use creds. I have not handled showing info about external remote creds because they can have 0, 1, or more separate cred pairs, and there's no way for info to enumerate them or know how they're used. So it seems ok to leave out creds info for external remotes.
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Glacier.hs3
-rw-r--r--Remote/WebDAV.hs3
2 files changed, 4 insertions, 2 deletions
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs
index 0e2796da2..99003f29a 100644
--- a/Remote/Glacier.hs
+++ b/Remote/Glacier.hs
@@ -67,7 +67,8 @@ gen r u c gc = new <$> remoteCost gc veryExpensiveRemoteCost
availability = GloballyAvailable,
remotetype = remote,
mkUnavailable = return Nothing,
- getInfo = return [("glacier vault", getVault c)]
+ getInfo = includeCredsInfo c (AWS.creds u) $
+ [ ("glacier vault", getVault c) ]
}
specialcfg = (specialRemoteCfg c)
-- Disabled until jobList gets support for chunks.
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
index 0981c4373..932ed81e0 100644
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@@ -72,7 +72,8 @@ gen r u c gc = new <$> remoteCost gc expensiveRemoteCost
availability = GloballyAvailable,
remotetype = remote,
mkUnavailable = gen r u (M.insert "url" "http://!dne!/" c) gc,
- getInfo = return [("url", fromMaybe "unknown" (M.lookup "url" c))]
+ getInfo = includeCredsInfo c (davCreds u) $
+ [("url", fromMaybe "unknown" (M.lookup "url" c))]
}
chunkconfig = getChunkConfig c