aboutsummaryrefslogtreecommitdiff
path: root/doc/tips
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-11-30 14:35:24 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-11-30 14:35:24 -0400
commit66b3af4aa5c3bbb53fc27b25303c4e69364930f5 (patch)
treeacb9491353a5c5f8a143b29e8aff92533b8c359d /doc/tips
parentef6cd4fe3a5bf0163ae3e50ac6248dc11d8a7bcf (diff)
implement p2p command
Diffstat (limited to 'doc/tips')
-rw-r--r--doc/tips/peer_to_peer_network_with_tor.mdwn16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/tips/peer_to_peer_network_with_tor.mdwn b/doc/tips/peer_to_peer_network_with_tor.mdwn
index 94470b96a..de018e3ce 100644
--- a/doc/tips/peer_to_peer_network_with_tor.mdwn
+++ b/doc/tips/peer_to_peer_network_with_tor.mdwn
@@ -44,7 +44,7 @@ repository:
Now, tell the new peer about the address of the first peer:
- git annex p2p --link-remote peer1 tor-annnex::eeaytkuhaupbarfi.onion:4412:7f53c5b65b8957ef626fd461ceaae8056e3dbc459ae715e4
+ git annex p2p --link tor-annnex::eeaytkuhaupbarfi.onion:4412:7f53c5b65b8957ef626fd461ceaae8056e3dbc459ae715e4 --named peer1
(Of course, you should paste in the address you generated earlier,
not the example one shown above.)
@@ -56,8 +56,8 @@ You can run any commands you normally would to sync with that remote:
git annex sync --content peer1
You can also generate an address for this new peer, by running `git annex
-p2p --gen-address`, and add that address to other peers using `git annex
-p2p --link-remote`. It's often useful to link peers up in both directions,
+p2p --gen-address`, and link other peers to that address using `git annex
+p2p --link`. It's often useful to link peers up in both directions,
so peer1 is a remote of peer2 and peer2 is a remote of peer1.
Any number of peers can be connected this way, within reason.
@@ -88,14 +88,14 @@ You can `git pull`, push, etc with those onion addresses:
git remote add peer1 tor-annnex::eeaytkuhaupbarfi.onion:4412
Onion addresses are semi-public. When you add a remote, they appear in your
-`.git/config` file. So, there's a second level of authentication that
-git-annex uses to make sure that only people you want to can access your
-repository over Tor. That takes the form of a long string of numbers and
-letters, like "7f53c5b65b8957ef626fd461ceaae8056e3dbc459ae715e4".
+`.git/config` file. For security, there's a second level of authentication
+that git-annex uses to make sure that only people you want to can access
+your repository over Tor. That takes the form of a long string of numbers
+and letters, like "7f53c5b65b8957ef626fd461ceaae8056e3dbc459ae715e4".
The addresses generated by `git annex peer --gen-address`
combine the onion address with the authentication data.
-When you run `git annex peer --link-remote`, it sets up a git remote using
+When you run `git annex peer --link`, it sets up a git remote using
the onion address, and it stashes the authentication data away in a file in
`.git/annex/creds/`