commit 5d9cc376b456da7c0c846a1038901ceb26e6a7d6
Author: Runa A. Sandvik <[email protected]>
Date: Mon Nov 7 09:31:07 2011 +0000
Updated the tor cloud documentation
---
html/img/step-4.png | Bin 36852 -> 35100 bytes
html/index.html | 99 +++++++++++++++++++++++++++++---------------------
2 files changed, 57 insertions(+), 42 deletions(-)
diff --git a/html/img/step-4.png b/html/img/step-4.png
index 68cd366..a8f1060 100644
Binary files a/html/img/step-4.png and b/html/img/step-4.png differ
diff --git a/html/index.html b/html/index.html
index 660d0c1..e4c8710 100644
--- a/html/index.html
+++ b/html/index.html
@@ -49,47 +49,51 @@
<div class="main" role="main">
<hgroup>
<div class="deco first"></div>
- <h2>Tor Cloud on Amazon EC2</h2>
+ <h2>Tor in the Amazon cloud</h2>
</hgroup>
- <p>The Tor Cloud is a user friendly way of deploying bridges
- to help users in countries securely access the Internet,
- free of censorship. By donating your bandwidth to the Tor
- Network, you improve the safety and speed at which users
- can access the Internet. <a href="https://www.torproject.org";
- target="_blank">Learn more about Tor »</a></p>
+ <p>The Tor Cloud project gives you a user-friendly way of deploying
+ bridges to help users access an uncensored Internet. By setting up a
+ bridge, you donate bandwidth to the Tor network and help improve the
+ safety and speed at which users can access the Internet. <a
+ href="https://www.torproject.org";
+ target="_blank">Learn more about Tor »</a></p>
<p>This project runs on the Amazon EC2 cloud computing
- platform, which powers Amazon.com and other major websites
- such as Netflix. Users are able to launch their own
- virtual machines and computing resources with flexible and
- cost-effective terms. The Tor network can always benefit from
- more volunteer bandwidth. <a href="http://aws.amazon.com/ec2/";
+ platform, which powers Amazon.com and other major websites. Amazon
+ EC2 allows users to launch their own virtual machines and computing
+ resources with flexible and cost-effective terms. <a
+ href="http://aws.amazon.com/ec2/";
target="_blank">Learn more about Amazon EC2 »</a></p>
- <p>Setting up a Tor bridge in the Amazon cloud is simple and
- will only take you a couple of minutes. The images have all been
- configured with automatic package updates and port forwarding, so you
- do not have to worry about Tor not working or lacking security updates.
+ <p>Setting up a Tor bridge on Amazon EC2 is simple and will only take
+ you a couple of minutes. The images have been configured with automatic
+ package updates and port forwarding, so you do not have to worry about
+ Tor not working or the server not getting security updates.
<a href="https://cloud.torproject.org/#get_started"; target="_blank">Get
started with Tor Cloud »</a></p>
<hgroup>
<div class="deco"></div>
- <h2>AWS Free Usage Tier</h2>
+ <h2>How much does it cost?</h2>
</hgroup>
- <p>750 hours of Amazon EC2 Linux Micro Instance usage,
- enough hours to run continuously each month.</p>
- <p class="footnote">* visit <a
- href="http://aws.amazon.com/free/";
+ <p>To help new customers get started in the cloud, Amazon is
+ introducing a free usage tier. The Tor Cloud images are all micro
+ instances, and new customers will be able to run a free micro
+ instance for a whole year. Please see <a
href="http://aws.amazon.com/free/";
target="_blank">http://aws.amazon.com/free/</a> for
details. </p>
- <p>Don't qualify for the Free Tier? No problem, our images
- are configured to limit usage at $30/month based on Amazon
- fees.</p>
+ <p>Don't qualify for the Free Tier? No problem. The Tor Cloud
+ images have been <a href="torrc.txt">configured</a> with a
+ bandwidth limit. We have <a
+
href="https://trac.torproject.org/projects/tor/ticket/3574#comment:4";>estimated</a>
+ that running a bridge will cost around $30 a month, depending on
+ the region you put it in. See the <a
+ href="http://aws.amazon.com/ec2/pricing/";>Amazon EC2
+ Pricing</a> page for more information.</p>
</div>
<!-- Get Started -->
<div class="main" role="main">
<hgroup>
<div class="deco first"></div>
- <h2>Sign up for an AWS account</h2>
+ <h2>Sign up</h2>
</hgroup>
<p>Before you can set up a bridge, you need to sign up for
an <i>Amazon <br> Web Services (AWS)</i> account.
@@ -102,16 +106,19 @@
</p>
<hgroup>
<div class="deco"></div>
- <h2>Select type of relay and its location</h2>
+ <h2>Select a region</h2>
</hgroup>
- <p>The images below have been configured as public bridges.
- The cost of running a bridge in the Amazon Cloud depends on
- a number of factors, including the region you decide to
- put it in. See <a href="http://aws.amazon.com/ec2/pricing/";>Amazon
EC2
- Pricing</a> for more information.</p>
+ <p>The images below are all configured as bridges.
+ We have <a
+
href="https://trac.torproject.org/projects/tor/ticket/3574#comment:4";>estimated</a>
+ that running a bridge will cost around $30 a month, depending on
+ the region you put it in. See the <a
+ href="http://aws.amazon.com/ec2/pricing/";>Amazon EC2
+ Pricing</a> page for more information.</p>
<br>
<ul class="region-nav">
- <li><a class="region"
href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-11af6d78";
target="_blank">us-east-1<br>Virginia</a></li>
+ <li><a class="region"
+
href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-11af6d78";
target="_blank">us-east-1<br>Virginia</a></li>
<li><a class="region"
href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-4bf9a40e";
target="_blank">us-west-1<br>N. California</a></li>
<li><a class="region"
href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami-3807b239";
target="_blank">ap-northeast-1<br>Tokyo</a></li>
<li><a class="region"
href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-9c99aae8";
target="_blank">eu-west-1<br>Ireland</a></li>
@@ -120,10 +127,12 @@
<hgroup>
<div class="deco"></div>
- <h2>Step by Step Process</h2>
+ <h2>Step by step process</h2>
</hgroup>
- <p>Once you have selected a relay and its location, you will be
redirected to Amazon's management console.
- Simply follow the steps as illustrated below, and your relay will
up and running in just a couple of minutes:</p>
+ <p>After selecting the region, you will be redirected to Amazon's
+ management console. Simply follow the steps as illustrated below,
+ and your bridge will up and running in just a couple of
+ minutes:</p>
<div class='slider-wrapper theme-orman'>
<div id='slider' class='nivoSlider'>
<img src="img/tor-1.png" alt="" title="Click
@@ -133,14 +142,19 @@
<img src="img/step-3.png" alt="" title="Click
"Continue". (No changes needed here.)"/>
<img src="img/step-4.png" alt="" title="Select
- "Proceed without Key Pair" and click
- "Continue"."/>
+ "Create a new Key Pair", type
+ "tor-cloud-servers" for key pair name, and
+ click "Create & Download your Key Pair". You will
+ need the key pair if you want to connect to your instance
+ using SSH."/>
<img src="img/step-5.png" alt="" title="Select
- "Create a new Security Policy",
+ "Create a new Security Group",
type "tor-cloud-servers" for Group
- Name and Description. Select "HTTPS"
+ Name and Group Description. You need to create two
+ rules; HTTPS and SSH. Select "HTTPS"
from the "Create a new rule" dropdown
- and click on "Add Rule". Then Click
+ and click on "Add Rule". Do the same for
+ SSH. Then click
"Continue"."/>
<img src="img/step-6.png" alt="" title="Click
"Launch"."/>
@@ -171,7 +185,8 @@
SSH.</p>
<p><b>3. What's in the Tor configuration file?</b><br>
- Answer here.</p>
+ The Tor configuration file that the images have been
+ configured with can be found <a href="torrc.txt">here</a>.</p>
<p><b>4. Will the images automatically download and install package
updates?</b><br>
Yes, the images have all been configured with the <a
href="https://help.ubuntu.com/community/AutomaticSecurityUpdates";><i>unattended-upgrades</i></a>
package. This means that your system will automatically download and install
updates.</p>
@@ -189,7 +204,7 @@
Yes, simply join #tor on irc.oftc.net and ask your question. It may
take a while before we get back to you, so please be patient.</p>
<p><b>8. I have a question that is not answered here, what do I
do?</b><br>
- Please send an email to <i>help AT rt.torproject.org</i> and we'll make
sure it gets added to the list.</p>
+ Please send an email to <i>help AT rt.torproject.org</i>.</p>
</div>
</div>
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
