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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2014-04-11 12:30:38 -04:00
commit fd49e7f1b1
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/git-annex-shell.mdwn
View file

@ -106,6 +106,9 @@ changed.
If set, disallows any command that could modify the repository. If set, disallows any command that could modify the repository.
Note that this does not prevent passing commands on to git-shell.
For that, you also need ...
* GIT_ANNEX_SHELL_LIMITED * GIT_ANNEX_SHELL_LIMITED
If set, disallows running git-shell to handle unknown commands. If set, disallows running git-shell to handle unknown commands.

12
doc/tips/using_gitolite_with_git-annex.mdwn
View file

@ -3,8 +3,6 @@ manager. Here's how to add git-annex support to gitolite, so you can
`git annex copy` files to a gitolite repository, and `git annex get` `git annex copy` files to a gitolite repository, and `git annex get`
files from it. files from it.
Warning : The method described here works with gitolite version g2, avaible in the g2 branch on github. There is an experimental support for g3 in the git-annex branch, if you tested it please add some feedback.
A nice feature of using gitolite with git-annex is that users can be given A nice feature of using gitolite with git-annex is that users can be given
read-only access to a repository, and this allows them to `git annex get` read-only access to a repository, and this allows them to `git annex get`
file contents, but not change anything. file contents, but not change anything.
@ -12,7 +10,8 @@ file contents, but not change anything.
First, you need new enough versions: First, you need new enough versions:
* gitolite 2.2 is needed -- this version contains a git-annex-shell ADC * gitolite 2.2 is needed -- this version contains a git-annex-shell ADC
and supports "ua" ADCs. and supports "ua" ADCs. Alternatively, gitoline g3 also recently added
support for git-annex.
* git-annex 3.20111016 or newer needs to be installed on the gitolite * git-annex 3.20111016 or newer needs to be installed on the gitolite
server. Don't install an older version, it wouldn't be secure! server. Don't install an older version, it wouldn't be secure!
@ -39,6 +38,13 @@ cd /usr/local/lib/gitolite/adc/ua/
cp gitolite/contrib/adc/git-annex-shell . cp gitolite/contrib/adc/git-annex-shell .
</pre> </pre>
If using gitolite g3, an additional setup step is needed:
In the ENABLE list in the rc file, add an entry like this:
<pre>
'git-annex-shell ua',
</pre>
Now all gitolite repositories can be used with git-annex just as any Now all gitolite repositories can be used with git-annex just as any
ssh remote normally would be used. For example: ssh remote normally would be used. For example: