diff --git a/Tutorial.md b/Tutorial.md index 57f2291..923a808 100644 --- a/Tutorial.md +++ b/Tutorial.md @@ -47,7 +47,7 @@ allmydata-tahoe: 1.7.1, foolscap: 0.5.1, pycryptopp: 0.5.19, zfec: 1.4.7, Twiste ``` now Tahoe is installed \o/ -# Instanciate the nodes +# Instantiate the nodes So, after reading running.html, configuration.txt and architecture.txt, we'll first create an introducer node, that will get every other nodes to know each other. The @@ -64,7 +64,7 @@ we do on vm1.local) pb://6oibvp5whrb3v3ge7ajuyapooswsda2e@172.16.23.128:33272,127.0.0.1:33272/introducer ``` Then we copy that last string we got from 'cat', and paste it in tahoe.cfg, -as follows (edit it using your favorite editor, mine is vim) : +as follows : ``` vm2% vim ~/.tahoe/tahoe.cfg -------------8<----------------------8<---------------- @@ -95,8 +95,8 @@ wait a bit and do : % ps aux | grep tahoe myuser 5360 1.2 7.4 158820 28348 ? S< 02:13 0:00 /usr/bin/python /usr/bin/twistd -y tahoe-client.tac --logfile logs/twistd.log ``` -and you shall see an output that looks alike. If not, tahoe failed to start. -You've got to check ~/.tahoe/logs/ what got wrong. +and you should see output that looks similar. If not, tahoe failed to start. +You've got to check ~/.tahoe/logs/ to see what went wrong. # Configure the nodes @@ -129,8 +129,7 @@ Now, let's do some configuration. On each node edit tahoe.cfg : vm2% tahoe restart ``` -Then get your favorite browser and browse to the following URLs, you -should get pages similar to the ones below +Then browse to the following URLs and you should get pages similar to the ones below * ![](http://tahoe-lafs.org/trac/tahoe-lafs/attachment/wiki/Tutorial/172.16.23.1_3456_1.png) @@ -141,9 +140,7 @@ should get pages similar to the ones below * ![](http://tahoe-lafs.org/trac/tahoe-lafs/attachment/wiki/Tutorial/172.16.23.130_3456_1.png) -Now it's time to be able to store something on the grid, as -the whole purpose of Tahoe-LAFS, and thus of this tutorial is -to get a grid to store files. +Now it's time to be able to store something on the grid : On host and vm2, edit again ~/.tahoe/tahoe.cfg and modify it as follows : @@ -154,7 +151,7 @@ as follows : 31 [storage] 32 enabled = true 33 readonly = false - 34 reserved_space = 1GB # here you tell the storage server how much space you would like to use + 34 reserved_space = 1GB # here you tell the storage server how much disk space it cannot use ------------->8---------------------->8---------------- vm2% tahoe restart ``` @@ -177,8 +174,8 @@ Is that all ? Well, no, it's time to learn how to use it. # File capabilities ? -Now it's time for a bit of litterature. File capabilities are unique "keys" -associated with the files. It's used internally by Tahoe-LAFS to identify +Now it's time for a bit of literature. File capabilities are unique "keys" +associated with the files. They are used internally by Tahoe-LAFS to identify every file, and used as an URL to locate the file. For immutable files, capabilities are like hash table keys, they match @@ -187,7 +184,7 @@ different capabilities. For mutable files, there are read-only and read-write capabilities. A read-only capability will point to a version of a file. A read-write -capability represant the ability to read the file, the ability to write +capability represent the ability to read the file and the ability to write a new version of a file. for more informations, look at Capabilities section of: @@ -197,21 +194,19 @@ and at this wiki page: # Access your shares -You can store and access files on Tahoe-LAFS using a lot of -different ways. The fatest is to either use the Web UI, or -the CLI though you need to remember the caps of the files. +You can store and access files on Tahoe-LAFS in many +different ways. The fastest is to either use the Web UI (WUI), or +the command line (CLI) though you need to know the caps of the files. -Using the WUI is straight forward, connect to a storage client, +Using the WUI is straightforward: connect to a storage client, use the forms to add/get/remove files and directories. Just -always remember that once you created a directory, you need to -save the file's URI, or you won't be able to find it again later -on. +always remember that once you create a directory, you need to +save the directory's URI, or you won't be able to find it again. ## Using the CLI The CLI behaves mostly like a standard shell, with all -commands prefixed by 'tahoe', the same way version control -system work. +commands prefixed by 'tahoe'. If you execute for the first time : @@ -230,7 +225,7 @@ to the 'tahoe:' prefix. socket.error: [Errno 61] Connection refused ``` -What happens here is that the Tahoe client tries to connect to the URL +What happens here is that the Tahoe-LAFS client tries to connect to the URL given in the ~/.tahoe/node.url file. So, you need to edit ~/.tahoe/node.url ``` host% vim ~/.tahoe/node.url