diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-28 13:31:49 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-28 13:31:49 -0400 |
| commit | 1f8b494ed848db69dfdb2de528d1f9290131140b (patch) | |
| tree | 9920ba3f17a740eb367b34548a38471994b728d0 /Remote | |
| parent | 04f27132314744ad743cda697761b510b1cb17e8 (diff) | |
webapp: Defaults to sharing box.com account info with friends, allowing one-click enabling of the repository.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Glacier.hs | 2 | ||||
| -rw-r--r-- | Remote/S3.hs | 2 | ||||
| -rw-r--r-- | Remote/WebDAV.hs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs index f960c517f..55b704a33 100644 --- a/Remote/Glacier.hs +++ b/Remote/Glacier.hs @@ -221,7 +221,7 @@ glacierParams c params = datacenter:params (fromJust $ M.lookup "datacenter" c) glacierEnv :: RemoteConfig -> UUID -> Annex (Maybe [(String, String)]) -glacierEnv c u = go =<< getRemoteCredPair "glacier" c creds +glacierEnv c u = go =<< getRemoteCredPairFor "glacier" c creds where go Nothing = return Nothing go (Just (user, pass)) = do diff --git a/Remote/S3.hs b/Remote/S3.hs index 400f3e027..ba5fb949b 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -262,7 +262,7 @@ s3ConnectionRequired c u = maybe (error "Cannot connect to S3") return =<< s3Connection c u s3Connection :: RemoteConfig -> UUID -> Annex (Maybe AWSConnection) -s3Connection c u = go =<< getRemoteCredPair "S3" c (AWS.creds u) +s3Connection c u = go =<< getRemoteCredPairFor "S3" c (AWS.creds u) where go Nothing = return Nothing go (Just (ak, sk)) = return $ Just $ AWSConnection host port ak sk diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index b303dbe59..a5bba716b 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -7,7 +7,7 @@ {-# LANGUAGE ScopedTypeVariables #-} -module Remote.WebDAV (remote, setCredsEnv) where +module Remote.WebDAV (remote, davCreds, setCredsEnv) where import Network.Protocol.HTTP.DAV import qualified Data.Map as M @@ -321,7 +321,7 @@ noProps :: XML.Document noProps = XML.parseText_ XML.def $ LT.pack "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<propertyupdate/>" getCreds :: RemoteConfig -> UUID -> Annex (Maybe CredPair) -getCreds c u = getRemoteCredPair "webdav" c (davCreds u) +getCreds c u = getRemoteCredPairFor "webdav" c (davCreds u) davCreds :: UUID -> CredPairStorage davCreds u = CredPairStorage |