diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-05 12:21:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-05 12:35:05 -0400 |
| commit | 727e0ec0e1d2a2057fde863fa8bdee1ac9995502 (patch) | |
| tree | 8df8fcf384c1b95765a647bb8769203512fc2486 /Assistant/Threads | |
| parent | 21e51564dd50f1c956d89a49d1622a70d6216205 (diff) | |
webapp: When setting up authorized_keys, use GIT_ANNEX_SHELL_DIRECTORY.
Diffstat (limited to 'Assistant/Threads')
| -rw-r--r-- | Assistant/Threads/PairListener.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Assistant/Threads/PairListener.hs b/Assistant/Threads/PairListener.hs index cd297fad3..c169aa255 100644 --- a/Assistant/Threads/PairListener.hs +++ b/Assistant/Threads/PairListener.hs @@ -16,6 +16,7 @@ import Assistant.WebApp.Types import Assistant.Alert import Assistant.DaemonStatus import Utility.ThreadScheduler +import Git import Network.Multicast import Network.Socket @@ -120,7 +121,8 @@ pairReqReceived False urlrenderer msg = do pairAckReceived :: Bool -> Maybe PairingInProgress -> PairMsg -> [PairingInProgress] -> Assistant [PairingInProgress] pairAckReceived True (Just pip) msg cache = do stopSending pip - liftIO $ setupAuthorizedKeys msg + repodir <- repoPath <$> liftAnnex gitRepo + liftIO $ setupAuthorizedKeys msg repodir finishedPairing msg (inProgressSshKeyPair pip) startSending pip PairDone $ multicastPairMsg (Just 1) (inProgressSecret pip) (inProgressPairData pip) |