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/Pairing | |
| parent | 21e51564dd50f1c956d89a49d1622a70d6216205 (diff) | |
webapp: When setting up authorized_keys, use GIT_ANNEX_SHELL_DIRECTORY.
Diffstat (limited to 'Assistant/Pairing')
| -rw-r--r-- | Assistant/Pairing/MakeRemote.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Assistant/Pairing/MakeRemote.hs b/Assistant/Pairing/MakeRemote.hs index 8324fe1bd..dd15015a0 100644 --- a/Assistant/Pairing/MakeRemote.hs +++ b/Assistant/Pairing/MakeRemote.hs @@ -18,10 +18,10 @@ import qualified Data.Text as T {- Authorized keys are set up before pairing is complete, so that the other - side can immediately begin syncing. -} -setupAuthorizedKeys :: PairMsg -> IO () -setupAuthorizedKeys msg = do +setupAuthorizedKeys :: PairMsg -> FilePath -> IO () +setupAuthorizedKeys msg repodir = do validateSshPubKey pubkey - unlessM (liftIO $ addAuthorizedKeys False pubkey) $ + unlessM (liftIO $ addAuthorizedKeys False repodir pubkey) $ error "failed setting up ssh authorized keys" where pubkey = remoteSshPubKey $ pairMsgData msg |