From deca4cd90ad599f859fc9efafe509ed7375c6f39 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2016 15:26:16 -0400 Subject: use P2P auth for git-remote-tor-annex This changes the environment variable name to the more generic GIT_ANNEX_P2P_AUTHTOKEN. This commit was sponsored by andrea rota. --- Remote/Helper/Tor.hs | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'Remote/Helper') diff --git a/Remote/Helper/Tor.hs b/Remote/Helper/Tor.hs index 25d192023..b5a819c3b 100644 --- a/Remote/Helper/Tor.hs +++ b/Remote/Helper/Tor.hs @@ -8,26 +8,8 @@ module Remote.Helper.Tor where import Annex.Common -import Utility.AuthToken -import Creds -import Utility.Tor -import Utility.Env import Network.Socket -import qualified Data.Text as T - --- Read the first line of the creds file. Environment variable overrides. -getTorAuthTokenFor :: OnionAddress -> Annex (Maybe AuthToken) -getTorAuthTokenFor (OnionAddress onionaddress) = - maybe Nothing mk <$> getM id - [ liftIO $ getEnv torAuthTokenEnv - , readCacheCreds onionaddress - ] - where - mk = toAuthToken . T.pack . takeWhile (/= '\n') - -torAuthTokenEnv :: String -torAuthTokenEnv = "GIT_ANNEX_TOR_AUTHTOKEN" torHandle :: Socket -> IO Handle torHandle s = do -- cgit v1.2.3