From 79a5475b54295d5b44b93b888bb823015ede8756 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Apr 2013 20:00:32 -0400 Subject: use git-annex for ssh directory name --- Assistant/Ssh.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Assistant') 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. -- cgit v1.2.3