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

webapp: Fix authorized_keys line added when setting up a rsync remote on a server that also supports git-annex, to not force running git-annex-shell.

Browse source
This commit is contained in:
Joey Hess 2013-07-08 12:51:07 -04:00
parent ea12e0ff8f
commit 57f5c9f41a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -303,7 +303,7 @@ makeSsh' rsync setup origsshdata sshdata keypair = do
, if rsync then Nothing else Just "if [ ! -d .git ]; then git init --bare --shared; fi"
, if rsync then Nothing else Just "git annex init"
, if needsPubKey sshdata
then addAuthorizedKeysCommand (rsyncOnly sshdata) remotedir . sshPubKey <$> keypair
then addAuthorizedKeysCommand (rsync || rsyncOnly sshdata) remotedir . sshPubKey <$> keypair
else Nothing
]

3
debian/changelog vendored
View file

@ -20,6 +20,9 @@ git-annex (4.20130628) UNRELEASED; urgency=low
* Windows: Look for .exe extension when searching for a command in path.
* Pass -f to curl when downloading a file with it, so it propigates failure.
* Windows: Fix url to object when using a http remote.
* webapp: Fix authorized_keys line added when setting up a rsync remote
on a server that also supports git-annex, to not force running
git-annex-shell.
-- Joey Hess <joeyh@debian.org> Tue, 02 Jul 2013 15:40:55 -0400