* [[Basic usage|quickstart]]
* Want to make two nearby computers share the same synchronised folder?
- Follow the [[pairing_walkthrough]].
+ Follow the [[local_pairing_walkthrough]].
+* Or perhaps you want to share files between computers in different
+ locations, like home and work?
+ Follow the [[remote_sharing_walkthrough]].
* Want to share a synchronised folder with a friend?
Follow the [[share_with_a_friend_walkthrough]].
* Want to archive data to a drive or the cloud?
--- /dev/null
+So you have two computers in the same building, and you want them to share
+the same synchronised folder, communicating directly with each other.
+
+This is incredibly easy to set up with the git annex assistant.
+
+Let's say the two computers are your computer and your friend's computer.
+We'll start on your computer, where you open up your git annex dashboard.
+
+[[!img addrepository.png alt="Add another repository button"]]
+
+`*click*`
+
+[[!img pairing.png alt="Pair with another computer"]]
+
+`*click*`
+
+Now the hard bit. You have to think up a secret phrase, and type it in,
+(and perhaps get the spelling correct).
+
+[[!img secret.png alt="Enter secret phrase"]]
+
+Now your computer is in pairing mode. When your friend looks at her git
+annex dashboard, she sees something like this.
+
+[[!img pairrequest.png alt="Pair request"]]
+
+`*click*`
+
+[[!img secretempty.png alt="Enter same secret phrase"]]
+
+Now it's up to you to let her know what the secret is. As soon as she
+enters it, both your computers will be paired, and will begin to sync their
+git-annex folders. Just like that you can share files.
+
+----
+
+Something to keep in mind, especially if pairing doesn't seem to be
+working, is that the two computers need to be on the same network for this
+pairing process to work. Sometimes a building will have more than one
+network inside it, and you'll need to connect them both to the same one.
+Make sure the wireless network name is the same, or that they're both
+plugged into the same router.
+
+Also, the file sharing set up by this pairing only works when both
+computers are on the same network. If you go on a trip, any files you
+edit will not be visible to your friend until you get back.
+
+To get around this, you'll often also want to set up
+[[jabber_pairing|share_with_a_friend_walkthrough]], and a server
+in the cloud, which they can use to exchange files while away.
+
+And also, you can pair with as many other computers as you like, not just
+one!
+
+## What does pairing actually do behind the scenes?
+
+It ensures that both repositories have correctly configured
+[[remotes|walkthrough/adding_a_remote]] pointing to each other.
+If you have already configured this manually, you do not need to
+perform pairing.
--- /dev/null
+[[!comment format=mdwn
+ username="https://launchpad.net/~mattharrison"
+ ip="69.193.72.98"
+ subject="Pairing"
+ date="2012-10-29T17:56:06Z"
+ content="""
+Is there a way to do this pairing with one machine being a desktop machine and one a headless machine?
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.152.108.194"
+ subject="easy peasy"
+ date="2012-10-29T19:09:43Z"
+ content="""
+A headless machine is probably a server. On the same page that has the \"local computer\" link, there's a \"remote server\" link that'll get you set up.
+"""]]
+++ /dev/null
-So you have two computers in the same building, and you want them to share
-the same synchronised folder, communicating directly with each other.
-
-This is incredibly easy to set up with the git annex assistant.
-
-Let's say the two computers are your computer and your friend's computer.
-We'll start on your computer, where you open up your git annex dashboard.
-
-[[!img addrepository.png alt="Add another repository button"]]
-
-`*click*`
-
-[[!img pairing.png alt="Pair with another computer"]]
-
-`*click*`
-
-Now the hard bit. You have to think up a secret phrase, and type it in,
-(and perhaps get the spelling correct).
-
-[[!img secret.png alt="Enter secret phrase"]]
-
-Now your computer is in pairing mode. When your friend looks at her git
-annex dashboard, she sees something like this.
-
-[[!img pairrequest.png alt="Pair request"]]
-
-`*click*`
-
-[[!img secretempty.png alt="Enter same secret phrase"]]
-
-Now it's up to you to let her know what the secret is. As soon as she
-enters it, both your computers will be paired, and will begin to sync their
-git-annex folders. Just like that you can share files.
-
-----
-
-Something to keep in mind, especially if pairing doesn't seem to be
-working, is that the two computers need to be on the same network for this
-pairing process to work. Sometimes a building will have more than one
-network inside it, and you'll need to connect them both to the same one.
-Make sure the wireless network name is the same, or that they're both
-plugged into the same router.
-
-Also, the file sharing set up by this pairing only works when both
-computers are on the same network. If you go on a trip, any files you
-edit will not be visible to your friend until you get back.
-
-To get around this, you'll often also want to set up
-[[jabber_pairing|share_with_a_friend_walkthrough]], and a server
-in the cloud, which they can use to exchange files while away.
-
-And also, you can pair with as many other computers as you like, not just
-one!
-
-## What does pairing actually do behind the scenes?
-
-It ensures that both repositories have correctly configured
-[[remotes|walkthrough/adding_a_remote]] pointing to each other.
-If you have already configured this manually, you do not need to
-perform pairing.
+++ /dev/null
-[[!comment format=mdwn
- username="https://launchpad.net/~mattharrison"
- ip="69.193.72.98"
- subject="Pairing"
- date="2012-10-29T17:56:06Z"
- content="""
-Is there a way to do this pairing with one machine being a desktop machine and one a headless machine?
-"""]]
+++ /dev/null
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.152.108.194"
- subject="easy peasy"
- date="2012-10-29T19:09:43Z"
- content="""
-A headless machine is probably a server. On the same page that has the \"local computer\" link, there's a \"remote server\" link that'll get you set up.
-"""]]
* Archiving or backing up files to Amazon Glacier. See [[archival_walkthrough]].
* [[Sharing repositories with friends|share_with_a_friend_walkthrough]]
contacted through a Jabber server (such as Google Talk).
-* [[Pairing|pairing_walkthrough]] two computers that are on the same local
+* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local
network (or VPN) and automatically keeping the files in the annex in
sync as changes are made to them.
* Cloning your repository to removable drives, USB keys, etc. The assistant
* Archiving or backing up files to Amazon Glacier.
* [[Sharing repositories with friends|share_with_a_friend_walkthrough]]
contacted through a Jabber server (such as Google Talk).
-* [[Pairing|pairing_walkthrough]] two computers that are on the same local
+* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local
network (or VPN) and automatically keeping the files in the annex in
sync as changes are made to them.
* Cloning your repository to removable drives, USB keys, etc. The assistant
* Setting up cloud repositories, that are used as backups, archives,
or transfer points between repositories that cannot directly contact
one-another.
-* [[Pairing|pairing_walkthrough]] two computers that are on the same local
+* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local
network (or VPN) and automatically keeping the files in the annex in
sync as changes are made to them.
* Cloning your repository to removable drives, USB keys, etc. The assistant
In general, anything you can configure with the assistant's web app
will work. Some examples of use cases supported by this release include:
-* [[Pairing|pairing_walkthrough]] two computers that are on the same local
+* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local
network (or VPN) and automatically keeping the files in the annex in
sync as changes are made to them.
* Cloning your repository to removable drives, USB keys, etc. The assistant
In general, anything you can configure with the assistant's web app
will work. Some examples of use cases supported by this release include:
-* [[Pairing|pairing_walkthrough]] two computers that are on the same local
+* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local
network (or VPN) and automatically keeping the files in the annex in
sync as changes are made to them.
* Cloning your repository to removable drives, USB keys, etc. The assistant
--- /dev/null
+So you have two computers that are not in the same place, and you want them
+to share the same synchronised folder, communicating directly with each other.
+
+[[!inline feeds=no template=bare pages=videos/git-annex_assistant_remote_sharing]]
+
+You can add even more computers using the same method show here.
Start by opening up your git annex dashboard.
-[[!img pairing_walkthrough/addrepository.png alt="Add another repository button"]]
+[[!img local_pairing_walkthrough/addrepository.png alt="Add another repository button"]]
`*click*`
subject="comment 8"
date="2013-01-11T20:02:39Z"
content="""
-@Alexandre, what you want can be achieved by setting up XMPP pairing, and also [[local pairing|assistant/pairing_walkthrough]]. Then when computers are on the same network, transfers are done via the LAN.
+@Alexandre, what you want can be achieved by setting up XMPP pairing, and also [[local pairing|assistant/local_pairing_walkthrough]]. Then when computers are on the same network, transfers are done via the LAN.
@Laszlo, this can be set up without using the webapp. Just make the two repositories, using the webapp. Then go into each and run \"git remote add myotherrepo $path_to_other_repo\". Then assistant will automatically sync them. I *have* thought about adding a configurator for this to the webapp. It would help to know what use cases you're getting at with this.
<video controls width=400>
-<source type="video/mp4" src="http://downloads.kitenet.net/videos/git-annex/git-annex-assistant-archiving.ogv">
+<source src="http://downloads.kitenet.net/videos/git-annex/git-annex-assistant-archiving.ogv">
</video><br>
A <a href="http://downloads.kitenet.net/videos/git-annex/git-annex-assistant-archiving.ogv">9 minute screencast</a>
covering archiving your files with the [[git-annex assistant|/assistant]]</a>.
<video controls width=400>
-<source type="video/mp4" src="http://downloads.kitenet.net/videos/git-annex/git-annex-assistant-intro.ogv">
+<source src="http://downloads.kitenet.net/videos/git-annex/git-annex-assistant-intro.ogv">
</video><br>
A <a href="http://downloads.kitenet.net/videos/git-annex/git-annex-assistant-intro.ogv">8 minute screencast</a>
introducing the [[git-annex assistant|/assistant]]</a>.
--- /dev/null
+<video controls width=400>
+<source src="http://downloads.kitenet.net/videos/git-annex/git-annex-xmpp-pairing.ogv">
+</video><br>
+A <a href="http://downloads.kitenet.net/videos/git-annex/git-annex-xmpp-pairing.ogv">6 minute screencast</a>
+showing how to share files between your computers in different locations,
+such as home and work.
projects / git-annex.git / commitdiff
