[tor-commits] [tor-cloud/master] update with new images, new torrc, list of installed packages
runa at torproject.org
runa at torproject.org
Sat Apr 13 22:08:25 UTC 2013
commit 14932e861844028d73d2c4c644ad1bab3b383c52
Author: Runa A. Sandvik <runa.sandvik at gmail.com>
Date: Sat Apr 13 18:08:57 2013 -0400
update with new images, new torrc, list of installed packages
---
html/index.html | 56 +++++++++++++++++++++++++++++----------------------
html/obfstorrc.txt | 6 ++++-
html/privtorrc.txt | 7 +++++-
3 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/html/index.html b/html/index.html
index 9b8251d..37fc06e 100644
--- a/html/index.html
+++ b/html/index.html
@@ -138,31 +138,31 @@
href="https://cloud.torproject.org/">front page</a> for
information about pricing.</p>
- <br><h3>Obfsproxy Bridges (required ports: 22, 443, 52176)</h3>
+ <br><h3>Obfsproxy Bridges (required ports: 22, 443, 40872, 52176)</h3>
<ul class="region-nav">
- <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-b979f8d0" 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-723a1b37" 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-22981012" 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-75424f01" 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-4a7c1a23" 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-18ecc05d" 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-d09403e0" 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-20011554" 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-44da6245" 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-63a03759" 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-fcb66ee1" 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-061c9e07" 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-621c5330" 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-69d30974" target="_blank">sa-east-1<br>Sao Paulo</a></li>
<br / >
- <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchAmi=ami-63a03759" target="_blank">ap-southeast-2<br>Sydney</a></li>
+ <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchAmi=ami-08920232" target="_blank">ap-southeast-2<br>Sydney</a></li>
</ul><br /><br />
- <h3>Private Bridges (required ports: 22, 443, 52176)</h3>
+ <h3>Private Bridges (required ports: 22, 443, 40872, 52176)</h3>
<ul class="region-nav">
- <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-7178f918" 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-003a1b45" 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-16981026" 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-55424f21" 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-567c1a3f" 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-1aecc05f" 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-d29403e2" 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-22011556" 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-7eda627f" 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-96aeedc4" 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-e4b66ef9" 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-0a1c9e0b" 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-601c5332" 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-6bd30976" target="_blank">sa-east-1<br>Sao Paulo</a></li>
<br />
- <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchAmi=ami-65a0375f" target="_blank">ap-southeast-2<br>Sydney</a></li>
+ <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchAmi=ami-0e920234" target="_blank">ap-southeast-2<br>Sydney</a></li>
</ul>
@@ -193,11 +193,12 @@
<img src="img/step-5.png" alt="" title="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"
+ Name and Group Description. You need to create four
+ rules; SSH (22), HTTPS (443), 40872, and 52176 . Select "HTTPS"
from the "Create a new rule" dropdown
and click on "Add Rule". Do the same for
- SSH. Then click
+ SSH. Select "Custom TCP rule" and add port 40872, do the
+ same with 52176. Then click
"Continue"."/>
<img src="img/step-6.png" alt="" title="Click
"Launch"."/>
@@ -249,7 +250,13 @@
<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 (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".
+ Select "Create a new Security Group", type
+ "tor-cloud-servers" for Group Name and Group Description.
+ You need to create four rules; SSH (22), HTTPS (443),
+ 40872, and 52176. Select "SSH" from the "Create a new
+ rule" dropdown and click on "Add Rule". Do the same for
+ HTTPS. Select "Custom TCP rule" and add port 40872, do the
+ same with port 52176. Then click "Continue".
</div>
</div>
@@ -355,8 +362,9 @@
<p><b>9. What's in the Tor configuration file?</b><br>
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>
-
+ href="https://cloud.torproject.org/privtorrc.txt">private bridge</a>. The following packages are installed when you start a Tor Cloud instance: tor, tor-geoipdb, tor-arm, deb.torproject.org-keyring, obfsproxy.
+ </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
index a6bce85..da25287 100644
--- a/html/obfstorrc.txt
+++ b/html/obfstorrc.txt
@@ -18,13 +18,17 @@ ORListenAddress 0.0.0.0:9001
BridgeRelay 1
# Run obfsproxy
-ServerTransportPlugin obfs2 exec /usr/bin/obfsproxy --managed
+ServerTransportPlugin obfs2,obfs3 exec /usr/bin/obfsproxy --managed
+ServerTransportListenAddr obfs2 0.0.0.0:52176
+ServerTransportListenAddr obfs3 0.0.0.0:40872
# 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
+BandwidthRate 20KB
+BandwidthBurst 1GB
# Running a bridge relay just passes data to and from the Tor network --
# so it shouldn't expose the operator to abuse complaints.
diff --git a/html/privtorrc.txt b/html/privtorrc.txt
index 5b09eb0..353a009 100644
--- a/html/privtorrc.txt
+++ b/html/privtorrc.txt
@@ -14,15 +14,20 @@ ORPort 443
# advertise 443 but bind to 9001).
ORListenAddress 0.0.0.0:9001
-# Start Tor as a private bridge.
+# Start Tor as a private obfsproxy bridge
BridgeRelay 1
PublishServerDescriptor 0
+ServerTransportPlugin obfs2,obfs3 exec /usr/bin/obfsproxy --managed
+ServerTransportListenAddr obfs2 0.0.0.0:52176
+ServerTransportListenAddr obfs3 0.0.0.0:40872
# 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
+BandwidthRate 20KB
+BandwidthBurst 1GB
# Running a bridge relay just passes data to and from the Tor network --
# so it shouldn't expose the operator to abuse complaints.
More information about the tor-commits
mailing list