mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use git-annex for ssh directory name

Browse source
This commit is contained in:
Joey Hess 2013-04-14 20:00:32 -04:00
parent 3f4b03ebc6
commit 21f93de33c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Ssh.hs
View file

@ -162,7 +162,7 @@ genSshKeyPair = withTempDir "git-annex-keygen" $ \dir -> do
- regular ssh experience at all. Returns a modified SshData containing the - regular ssh experience at all. Returns a modified SshData containing the
- mangled hostname. - 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 - in ssh because of an **INSANE** behavior of gnome-keyring: It loads
- ~/.ssh/*.pub, and uses them indiscriminately. But using this key - ~/.ssh/*.pub, and uses them indiscriminately. But using this key
- for a normal login to the server will force git-annex-shell to run, - for a normal login to the server will force git-annex-shell to run,
@ -185,7 +185,7 @@ setupSshKeyPair sshkeypair sshdata = do
setSshConfig sshdata setSshConfig sshdata
[ ("IdentityFile", "~/.ssh/" ++ sshprivkeyfile) ] [ ("IdentityFile", "~/.ssh/" ++ sshprivkeyfile) ]
where where
sshprivkeyfile = "annex" </> "key." ++ mangleSshHostName sshdata sshprivkeyfile = "git-annex" </> "key." ++ mangleSshHostName sshdata
sshpubkeyfile = sshprivkeyfile ++ ".pub" sshpubkeyfile = sshprivkeyfile ++ ".pub"
{- Setups up a ssh config with a mangled hostname. {- Setups up a ssh config with a mangled hostname.