commit b7f34b238b1c32735aef15da3cee8f7136facb4a Author: Runa A. Sandvik <runa.sandvik@gmail.com> Date: Wed Sep 26 13:30:24 2012 +0100 Update cloud.tpo with new images and info about obfsproxy bridges --- html/fa/index.html | 34 ++++++++++++++++------------------ html/index.html | 49 +++++++++++++++++++++++++------------------------ html/obfstorrc.txt | 31 +++++++++++++++++++++++++++++++ html/privtorrc.txt | 29 +++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 42 deletions(-) diff --git a/html/fa/index.html b/html/fa/index.html index 0b4ff79..44336dc 100644 --- a/html/fa/index.html +++ b/html/fa/index.html @@ -105,29 +105,27 @@ <br> <!-- bridge URL update start here --> - <br><h3>Normal bridges</h3> - <ul class="region-nav"> + <br><h3>Obfsproxy Bridges (required ports: 22, 443, 52176)</h3> <ul class="region-nav"> - <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-37a71..." 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-5f705..." target="_blank">us-west-1<br>N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-4c53d..." target="_blank">us-west-2<br>Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-611c1..." target="_blank">eu-west-1<br>Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-89942..." 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-77220..." target="_blank">us-west-1<br>N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-6e74f..." target="_blank">us-west-2<br>Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-ffd8d..." target="_blank">eu-west-1<br>Ireland</a></li> <br /> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami-..." target="_blank">ap-northeast-1<br>Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami-..." target="_blank">ap-southeast-1<br>Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-d0c61..." target="_blank">sa-east-1<br>Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami-..." target="_blank">ap-northeast-1<br>Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami-..." target="_blank">ap-southeast-1<br>Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-68f72..." target="_blank">sa-east-1<br>Sao Paulo</a></li> </ul><br /><br /> - <h3>Private bridges</h3> + <h3>Private Bridges (required ports: 22, 443)</h3> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-11883..." 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-037b5..." target="_blank">us-west-1<br>N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-246fe..." target="_blank">us-west-2<br>Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-a71a1..." target="_blank">eu-west-1<br>Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-0d9e2..." 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-df587..." target="_blank">us-west-1<br>N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-2475f..." target="_blank">us-west-2<br>Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-39dbd..." target="_blank">eu-west-1<br>Ireland</a></li> <br /> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami-..." target="_blank">ap-northeast-1<br>Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami-..." target="_blank">ap-southeast-1<br>Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-86f82..." target="_blank">sa-east-1<br>Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami-..." target="_blank">ap-northeast-1<br>Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami-..." target="_blank">ap-southeast-1<br>Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-64e93..." target="_blank">sa-east-1<br>Sao Paulo</a></li> </ul> <!-- bridge URL update end here --> <hgroup> diff --git a/html/index.html b/html/index.html index 118bd51..5d6af52 100644 --- a/html/index.html +++ b/html/index.html @@ -137,27 +137,27 @@ Console. See <em>How much does it cost?</em> on the <a href="https://cloud.torproject.org/">front page</a> for information about pricing.</p> - <br><h3>Normal bridges</h3> - <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-37a71..." 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-5f705..." target="_blank">us-west-1<br>N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-4c53d..." target="_blank">us-west-2<br>Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-611c1..." target="_blank">eu-west-1<br>Ireland</a></li> + <br><h3>Obfsproxy Bridges (required ports: 22, 443, 52176)</h3> + <ul class="region-nav"> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-89942..." 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-77220..." target="_blank">us-west-1<br>N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-6e74f..." target="_blank">us-west-2<br>Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-ffd8d..." target="_blank">eu-west-1<br>Ireland</a></li> <br /> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami-..." target="_blank">ap-northeast-1<br>Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami-..." target="_blank">ap-southeast-1<br>Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-d0c61..." target="_blank">sa-east-1<br>Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami-..." target="_blank">ap-northeast-1<br>Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami-..." target="_blank">ap-southeast-1<br>Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-68f72..." target="_blank">sa-east-1<br>Sao Paulo</a></li> </ul><br /><br /> - <h3>Private bridges</h3> + <h3>Private Bridges (required ports: 22, 443)</h3> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-11883..." 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-037b5..." target="_blank">us-west-1<br>N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-246fe..." target="_blank">us-west-2<br>Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-a71a1..." target="_blank">eu-west-1<br>Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-0d9e2..." 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-df587..." target="_blank">us-west-1<br>N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-2475f..." target="_blank">us-west-2<br>Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-39dbd..." target="_blank">eu-west-1<br>Ireland</a></li> <br /> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami-..." target="_blank">ap-northeast-1<br>Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami-..." target="_blank">ap-southeast-1<br>Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-86f82..." target="_blank">sa-east-1<br>Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami-..." target="_blank">ap-northeast-1<br>Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami-..." target="_blank">ap-southeast-1<br>Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-64e93..." target="_blank">sa-east-1<br>Sao Paulo</a></li> </ul> <hgroup> @@ -243,7 +243,7 @@ <h2>Step 5</h2> <img src="img/step-5.png"/> <div class="caption"> - Select "Create a new Security Group", type "tor-cloud-servers" for Group 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". Do the same for SSH. Then click "Continue". + Select "Create a new Security Group", type "tor-cloud-servers" for Group Name and Group Description. You need to create two (or three, for an obfsproxy bridge) rules; HTTPS and SSH. Select "HTTPS" from the "Create a new rule" dropdown and click on "Add Rule". Do the same for SSH. Then click "Continue". </div> </div> @@ -275,7 +275,7 @@ <h2>Frequently Asked Questions (FAQ)</h2> </hgroup> - <p><b>0. Private bridge or normal bridge?</b><br> + <p><b>0. Private bridge or obfsproxy bridge?</b><br> If you set up a private bridge, your bridge will not tell the bridge authority that it exists. You will have to manually give out your bridge address to users. @@ -293,7 +293,7 @@ <p><b>2. The instance is running, what's next?</b><br> You should not have to do anything once the instance is up and running. Tor will start up as a bridge and confirm that it is reachable - from the outside. If you have set up a normal bridge, then it will also + from the outside. If you have set up an obfsproxy bridge, then it will also tell the bridge authority that it exists, and the address for your bridge will be given out to users.</p> @@ -305,7 +305,8 @@ that the <em>Public DNS</em> for your instance is <em>ec2-192-0-2-27.compute-1.amazonaws.com</em>, then you know that the IP address is <em>192.0.2.27</em>. All of the bridges run on port 443, so the - address of your bridge is <em>192.0.2.27:443</em>.</p> + address of your bridge is <em>192.0.2.27:443</em>. Obfsproxy bridges will + also run on port 52176.</p> <p><b>4. How can I check if my bridge is running?</b><br> There are two ways you can check to see if your bridge is running; @@ -346,9 +347,9 @@ href="http://www.atagar.com/arm/">here</a>.</p> <p><b>9. What's in the Tor configuration file?</b><br> - The Tor configuration file for normal bridges can be found <a - href="https://cloud.torproject.org/torrc.txt">here</a>. The configuration - file for private bridges also contain <em>PublishServerDescriptor 0</em>. </p> + Here's the configuration for an <a + href="https://cloud.torproject.org/obfstorrc.txt">obfsproxy bridge</a> and a <a + href="https://cloud.torproject.org/privtorrc.txt">private bridge</a>.</p> <p><b>10. 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> diff --git a/html/obfstorrc.txt b/html/obfstorrc.txt new file mode 100644 index 0000000..a6bce85 --- /dev/null +++ b/html/obfstorrc.txt @@ -0,0 +1,31 @@ +# Auto generated Tor $CONFIG config file + +# A unique handle for your server. +Nickname ec2$CONFIG$RESERVATION + +# Set "SocksPort 0" if you plan to run Tor only as a server, and not +# make any local application connections yourself. +SocksPort 0 + +# What port to advertise for Tor connections. +ORPort 443 + +# Listen on a port other than the one advertised in ORPort (that is, +# advertise 443 but bind to 9001). +ORListenAddress 0.0.0.0:9001 + +# Start Tor as a bridge. +BridgeRelay 1 + +# Run obfsproxy +ServerTransportPlugin obfs2 exec /usr/bin/obfsproxy --managed + +# Never send or receive more than 10GB of data per week. The accounting +# period runs from 10 AM on the 1st day of the week (Monday) to the same +# day and time of the next week. +AccountingStart week 1 10:00 +AccountingMax 10 GB + +# Running a bridge relay just passes data to and from the Tor network -- +# so it shouldn't expose the operator to abuse complaints. +ExitPolicy reject *:* diff --git a/html/privtorrc.txt b/html/privtorrc.txt new file mode 100644 index 0000000..5b09eb0 --- /dev/null +++ b/html/privtorrc.txt @@ -0,0 +1,29 @@ +# Auto generated Tor $CONFIG config file + +# A unique handle for your server. +Nickname ec2priv$RESERVATION + +# Set "SocksPort 0" if you plan to run Tor only as a server, and not +# make any local application connections yourself. +SocksPort 0 + +# What port to advertise for Tor connections. +ORPort 443 + +# Listen on a port other than the one advertised in ORPort (that is, +# advertise 443 but bind to 9001). +ORListenAddress 0.0.0.0:9001 + +# Start Tor as a private bridge. +BridgeRelay 1 +PublishServerDescriptor 0 + +# Never send or receive more than 10GB of data per week. The accounting +# period runs from 10 AM on the 1st day of the week (Monday) to the same +# day and time of the next week. +AccountingStart week 1 10:00 +AccountingMax 10 GB + +# Running a bridge relay just passes data to and from the Tor network -- +# so it shouldn't expose the operator to abuse complaints. +ExitPolicy reject *:*