diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-04 17:10:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-04 17:10:47 -0400 |
| commit | 96de5c9008c650fbef394405abae84fc3a382407 (patch) | |
| tree | 76df94d6904e2260649458ef36eda4ecf8e90664 /doc | |
| parent | 8a96e1d3a033290422466d05c66561dffe6e6e71 (diff) | |
| parent | c38c4df47a282e192c481b049230bd5c7a511ad1 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/assistant/local_pairing_walkthrough/comment_4_f6bf82c263fefe38701709d9dbd974cc._comment | 10 | ||||
| -rw-r--r-- | doc/special_remotes/rsync.mdwn | 22 |
2 files changed, 32 insertions, 0 deletions
diff --git a/doc/assistant/local_pairing_walkthrough/comment_4_f6bf82c263fefe38701709d9dbd974cc._comment b/doc/assistant/local_pairing_walkthrough/comment_4_f6bf82c263fefe38701709d9dbd974cc._comment new file mode 100644 index 000000000..6a9637481 --- /dev/null +++ b/doc/assistant/local_pairing_walkthrough/comment_4_f6bf82c263fefe38701709d9dbd974cc._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + nickname="joey" + subject="comment 4" + date="2013-05-04T16:39:23Z" + content=""" +Local pairing uses UDP port 55556. This is sent to multicast address 224.0.0.251 (same used by Avahi). + +(You also need TCP port 22 open for ssh.) +"""]] diff --git a/doc/special_remotes/rsync.mdwn b/doc/special_remotes/rsync.mdwn index 641faf474..581ac6b96 100644 --- a/doc/special_remotes/rsync.mdwn +++ b/doc/special_remotes/rsync.mdwn @@ -36,3 +36,25 @@ These parameters can be passed to `git annex initremote` to configure rsync: The `annex-rsync-options` git configuration setting can be used to pass parameters to rsync. + +## annex-rsync-transport + +You can use the `annex-rsync-transport` git configuration setting to choose +whether we run rsync over ssh or rsh. This setting is also used to specify +parameters that git annex will pass to ssh/rsh. + +ssh is the default transport; if you'd like to run rsync over rsh, modify your +.git/config to include + + annex-rsync-transport = rsh + +under the appropriate remote. + +To pass parameters to ssh/rsh, include the parameters after "rsh" or +"ssh". For example, to configure ssh to use the private key at +`/path/to/private/key`, specify + + annex-rsync-transport = ssh -i /path/to/private/key + +Note that environment variables aren't expanded here, so for example, you +cannot specify `-i $HOME/.ssh/private_key`. |