summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-04 16:52:47 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-04 16:52:47 -0400
commitf4dc223c868f289c6cf08ce2ce3b831dc01da6dd (patch)
tree2b25aad2750e0c48753ea919f78b3b8af087d168 /doc
parent6d304438ce1c04a01331f4dafd3672a00a40983b (diff)
parenta2ffe3dc6443195fdd65f1e1fcbeb2b5a2735396 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/git-annex-shell__58___bad_parameters_when_trying_to_configure_a_shell_sandbox/comment_3_ad9c8630afa3358d438e41953dd8acac._comment15
-rw-r--r--doc/bugs/remotes_disappeared/comment_3_794372fb37621f37478313abc4ee92cf._comment38
-rw-r--r--doc/git-annex-shell.mdwn25
3 files changed, 63 insertions, 15 deletions
diff --git a/doc/bugs/git-annex-shell__58___bad_parameters_when_trying_to_configure_a_shell_sandbox/comment_3_ad9c8630afa3358d438e41953dd8acac._comment b/doc/bugs/git-annex-shell__58___bad_parameters_when_trying_to_configure_a_shell_sandbox/comment_3_ad9c8630afa3358d438e41953dd8acac._comment
new file mode 100644
index 000000000..4fd37bee9
--- /dev/null
+++ b/doc/bugs/git-annex-shell__58___bad_parameters_when_trying_to_configure_a_shell_sandbox/comment_3_ad9c8630afa3358d438e41953dd8acac._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="anarcat"
+ subject="""fixed up"""
+ date="2016-04-04T20:30:22Z"
+ content="""
+
+Why doesn't the assistant use git-annex -c instead of setting up a
+wrapper that can potentially break? Seems like one moving parts too
+many...
+
+I have removed the wrapper from the manpage, as it seems a little
+annoying to setup manually for no real advantage that I can see. Note
+that the double-quotes need to be quoted otherwise the public key is
+completely ignored.
+"""]]
diff --git a/doc/bugs/remotes_disappeared/comment_3_794372fb37621f37478313abc4ee92cf._comment b/doc/bugs/remotes_disappeared/comment_3_794372fb37621f37478313abc4ee92cf._comment
new file mode 100644
index 000000000..2fa413cc0
--- /dev/null
+++ b/doc/bugs/remotes_disappeared/comment_3_794372fb37621f37478313abc4ee92cf._comment
@@ -0,0 +1,38 @@
+[[!comment format=mdwn
+ username="anarcat"
+ subject="""comment 3"""
+ date="2016-04-04T20:39:24Z"
+ content="""
+No trust information was ever assigned to that remote:
+
+ [1012]anarcat@angela:mp31$ git show git-annex:trust.log | grep 6f812272-18c8-4346-b68a-f57ae50f657e
+ [1013]anarcat@angela:mp31$ git log -p git-annex -- trust.log | grep 6f812272-18c8-4346-b68a-f57ae50f657e
+ [1014]anarcat@angela:mp31$
+
+None of the repositories removed from the `git annex info` display
+were ever marked as dead, in fact, two of those were marked as
+`trusted`, from what I can see here:
+
+ [1018]anarcat@angela:mp31$ for repo in 22921df6-ff75-491c-b5d9-5a2aab33a689 f8818d12-9882-4ca5-bc0f-04e987888a8d 3f6d8082-6f4b-4faa-a3d9-bd5db1891077 4249a4ea-343a-43a8-9bba-457d2ff87c7d f867da6f-78cb-49be-a0db-d1c8e5f53664 ; do
+ > git log -p git-annex -- trust.log | grep $repo
+ > done
+ 22921df6-ff75-491c-b5d9-5a2aab33a689 1 timestamp=1400247400.46351s
+ +22921df6-ff75-491c-b5d9-5a2aab33a689 1 timestamp=1400247400.46351s
+ f8818d12-9882-4ca5-bc0f-04e987888a8d 1 timestamp=1424140026.947448s
+ f8818d12-9882-4ca5-bc0f-04e987888a8d 1 timestamp=1424140026.947448s
+ +f8818d12-9882-4ca5-bc0f-04e987888a8d 1 timestamp=1424140026.947448s
+
+And yes, I did run a transition a while back. I don't remember if I
+ran it multiple times: this is one of my first git-annex repos, so a
+lot of stuff may have happened to it its 3 years of existence:
+
+ $ git log | tail -5
+ commit 2400a4b46bc2b1a015e6881ef0c331c519016b64
+ Author: Antoine Beaupré <anarcat@koumbit.org>
+ Date: Sun Aug 18 22:14:47 2013 -0400
+
+ enter git annex
+
+It seems to me that the transition mechanism *may* be triggered before
+the `uuid.log` or `trust.log` files be fully merged - is that possible?
+"""]]
diff --git a/doc/git-annex-shell.mdwn b/doc/git-annex-shell.mdwn
index 502a1358a..ae696aec3 100644
--- a/doc/git-annex-shell.mdwn
+++ b/doc/git-annex-shell.mdwn
@@ -136,25 +136,20 @@ changed.
# EXAMPLES
-git-annex-shell(1) is usually called through a wrapper installed by the git-annex-assistant(1) in the `~/.ssh/authorized_keys` file on the remote host. To make such a setup manually, you will need the following wrapper installed in `~/.ssh/git-annex-shell`:
+git-annex-shell(1) is usually called through a wrapper installed by
+the git-annex-assistant(1) in the `~/.ssh/authorized_keys` file on the
+remote host. You can also do a similar setup by adding a specific
+line with a `command=` parameter to `~/.ssh/authorized_keys` by hand.
- #!/bin/sh
-
- set -e
- if [ "x$SSH_ORIGINAL_COMMAND" != "x" ]; then
- exec /usr/bin/git-annex-shell -c "$SSH_ORIGINAL_COMMAND"
- else
- exec /usr/bin/git-annex-shell -c "$@"
- fi
+For example, the following forces the key to be read-only, run only
+git-annex commands on the given directory:
-Then restrictions can be implemented to specific SSH keys using the
-`command=` parameter. For example, the following forces the key to be
-read-only, run only git-annex commands on the given directory:
-
- command="GIT_ANNEX_SHELL_DIRECTORY=/srv/annex GIT_ANNEX_SHELL_LIMITED=true GIT_ANNEX_SHELL_READONLY=true ~/.ssh/git-annex-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding ssh-rsa AAAAB3NzaC1y[...] user@example.com
+ command="GIT_ANNEX_SHELL_DIRECTORY=/srv/annex GIT_ANNEX_SHELL_LIMITED=true GIT_ANNEX_SHELL_READONLY=true git-annex-shell -c \"$SSH_ORIGINAL_COMMAND\"",no-agent-forwarding,no-port-forwarding,no-X11-forwarding ssh-rsa AAAAB3NzaC1y[...] user@example.com
Obviously, `ssh-rsa AAAAB3NzaC1y[...] user@example.com` needs to
-replaced with your SSH key.
+replaced with your SSH key. The above also assumes `git-annex-shell`
+is availble in your `$PATH`, use an absolute path if it is not the
+case.
# SEE ALSO