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

webapp: Fix ssh setup with nonstandard port, broken in last release.

Browse source
This commit is contained in:
Joey Hess 2013-07-02 15:46:02 -04:00
parent c6077de72d
commit 1b395dcb76
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Configurators/Ssh.hs
View file

@ -292,7 +292,7 @@ makeSsh rsync setup sshdata
makeSsh' :: Bool -> (Remote -> Handler ()) -> SshData -> SshData -> Maybe SshKeyPair -> Handler Html makeSsh' :: Bool -> (Remote -> Handler ()) -> SshData -> SshData -> Maybe SshKeyPair -> Handler Html
makeSsh' rsync setup origsshdata sshdata keypair = do makeSsh' rsync setup origsshdata sshdata keypair = do
sshSetup [sshhost, remoteCommand] "" $ sshSetup ["-p", show (sshPort origsshdata), sshhost, remoteCommand] "" $
makeSshRepo rsync setup sshdata makeSshRepo rsync setup sshdata
where where
sshhost = genSshHost (sshHostName origsshdata) (sshUserName origsshdata) sshhost = genSshHost (sshHostName origsshdata) (sshUserName origsshdata)

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (4.20130628) UNRELEASED; urgency=low
* webapp: Fix ssh setup with nonstandard port, broken in last release.
-- Joey Hess <joeyh@debian.org> Tue, 02 Jul 2013 15:40:55 -0400
git-annex (4.20130627) unstable; urgency=low git-annex (4.20130627) unstable; urgency=low
* assistant --autostart: Automatically ionices the daemons it starts. * assistant --autostart: Automatically ionices the daemons it starts.

3
doc/bugs/Wrong_port_while_configuring_ssh_remote.mdwn
View file

@ -30,3 +30,6 @@ ssh: connect to host xxxxx port 22: Connection refused
# End of transcript or log. # End of transcript or log.
"""]] """]]
> [[Fixed|done]]; this bug was introcuded in version
> 4.20130627 while making some other ssh fixes. --[[Joey]]