diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-14 20:00:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-14 20:00:32 -0400 |
| commit | 79a5475b54295d5b44b93b888bb823015ede8756 (patch) | |
| tree | e71b5c427999839149560c9bcf83e241133d6e50 /Assistant/Ssh.hs | |
| parent | 1f80c7bff368704647b75b777c9e445f33d3c5e4 (diff) | |
use git-annex for ssh directory name
Diffstat (limited to 'Assistant/Ssh.hs')
| -rw-r--r-- | Assistant/Ssh.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 10eb025ac..487f62c91 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -162,7 +162,7 @@ genSshKeyPair = withTempDir "git-annex-keygen" $ \dir -> do - regular ssh experience at all. Returns a modified SshData containing the - mangled hostname. - - - Note that the key files are put in ~/.ssh/annex/, rather than directly + - Note that the key files are put in ~/.ssh/git-annex/, rather than directly - in ssh because of an **INSANE** behavior of gnome-keyring: It loads - ~/.ssh/*.pub, and uses them indiscriminately. But using this key - for a normal login to the server will force git-annex-shell to run, @@ -185,7 +185,7 @@ setupSshKeyPair sshkeypair sshdata = do setSshConfig sshdata [ ("IdentityFile", "~/.ssh/" ++ sshprivkeyfile) ] where - sshprivkeyfile = "annex" </> "key." ++ mangleSshHostName sshdata + sshprivkeyfile = "git-annex" </> "key." ++ mangleSshHostName sshdata sshpubkeyfile = sshprivkeyfile ++ ".pub" {- Setups up a ssh config with a mangled hostname. |