commit 6de0bea435e848868d16e1a6bfbf859acf6fe1e1 Author: Runa A. Sandvik runa.sandvik@gmail.com Date: Sat Oct 8 17:33:26 2011 +0100
Move build instructions to BUILD, write a new README and remove the tor-cloud file --- BUILD | 41 ++++++++++++++++++++++++++++++++ README | 47 ++++++------------------------------ tor-cloud | 78 ------------------------------------------------------------- 3 files changed, 49 insertions(+), 117 deletions(-)
diff --git a/BUILD b/BUILD new file mode 100644 index 0000000..5866339 --- /dev/null +++ b/BUILD @@ -0,0 +1,41 @@ + +Installation: + + 1) Install ec2-api-tools on your laptop or build machine + 2) Generate and save your private keys: + export EC2_PRIVATE_KEY=~/keys/pk.cert + export EC2_CERT=~./keys/cert.pem + 3) Test your ec2-api-tools: + root@inf0:~/Tor-Cloud# ec2-describe-regions + REGION eu-west-1 ec2.eu-west-1.amazonaws.com + REGION us-east-1 ec2.us-east-1.amazonaws.com + REGION ap-northeast-1 ec2.ap-northeast-1.amazonaws.com + REGION us-west-1 ec2.us-west-1.amazonaws.com + REGION ap-southeast-1 ec2.ap-southeast-1.amazonaws.com + + 4) Generate private keys for each region: + for example: ec2-add-keypair --region us-east-1 tor-cloud-east-1 + and save the key in: ~/keys/tor-cloud-east-1.pem, don't forget to run chmod 600 ~/keys/* + + Your folder should look like this: + root@inf0:~/Tor-Cloud# ls /home/architect/keys/ -lh + -rw------- 1 root root 1.7K 2011-09-12 19:11 tor-cloud-ap-northeast-1.pem + -rw------- 1 root root 1.7K 2011-09-12 19:13 tor-cloud-ap-southeast-1.pem + -rw------- 1 root root 1.7K 2011-09-12 19:14 tor-cloud-eu-west-1.pem + -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-east-1.pem + -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-west-1.pem + + 5) Create a Security Group called "tor-cloud-build" and allow SSH inbound traffic. + + 6) You are now ready to build Bridge AMIs: + For example, to build in "ap-southeast-1" region run: + ./build.sh bridge ap-southeast-1 /home/architect/keys/tor-cloud-ap-southeast-1.pem tor-cloud-ap-southeast-1 + + TIP: You can run the build command for all the regions at the same time. Use screen or & to send the process to background! + + + + + + + diff --git a/README b/README index 5866339..8ac1690 100644 --- a/README +++ b/README @@ -1,41 +1,10 @@ +The Tor Cloud Project is a collaboration between Expression Technologies +and the Tor Project, Inc. The goal of this project is to provide +bridge-by-default images for Amazon EC2.
-Installation: +All tickets related to this project can be found under the "Tor Cloud" +component on trac.torproject.org.
- 1) Install ec2-api-tools on your laptop or build machine - 2) Generate and save your private keys: - export EC2_PRIVATE_KEY=~/keys/pk.cert - export EC2_CERT=~./keys/cert.pem - 3) Test your ec2-api-tools: - root@inf0:~/Tor-Cloud# ec2-describe-regions - REGION eu-west-1 ec2.eu-west-1.amazonaws.com - REGION us-east-1 ec2.us-east-1.amazonaws.com - REGION ap-northeast-1 ec2.ap-northeast-1.amazonaws.com - REGION us-west-1 ec2.us-west-1.amazonaws.com - REGION ap-southeast-1 ec2.ap-southeast-1.amazonaws.com - - 4) Generate private keys for each region: - for example: ec2-add-keypair --region us-east-1 tor-cloud-east-1 - and save the key in: ~/keys/tor-cloud-east-1.pem, don't forget to run chmod 600 ~/keys/* - - Your folder should look like this: - root@inf0:~/Tor-Cloud# ls /home/architect/keys/ -lh - -rw------- 1 root root 1.7K 2011-09-12 19:11 tor-cloud-ap-northeast-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:13 tor-cloud-ap-southeast-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:14 tor-cloud-eu-west-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-east-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-west-1.pem - - 5) Create a Security Group called "tor-cloud-build" and allow SSH inbound traffic. - - 6) You are now ready to build Bridge AMIs: - For example, to build in "ap-southeast-1" region run: - ./build.sh bridge ap-southeast-1 /home/architect/keys/tor-cloud-ap-southeast-1.pem tor-cloud-ap-southeast-1 - - TIP: You can run the build command for all the regions at the same time. Use screen or & to send the process to background! - - - - - - - +The code was hosted by Expression Tech on github.com/inf0/Tor-Cloud/, +but was moved to gitweb.torproject.org/user/runa/tor-cloud.git on +October 8, 2011. diff --git a/tor-cloud b/tor-cloud deleted file mode 100644 index 73bf8de..0000000 --- a/tor-cloud +++ /dev/null @@ -1,78 +0,0 @@ -Tor Cloud - -Users on the Internet are being introduced to many cloud-based services. -Amazon Web Service offers a cloud based hosting service called EC2. Users are -able to launch virtual machines and pay only for what they use. Tor network can -always use more bandwidth and more nodes in different places around the globe. -Spot Instances are a new way to purchase and consume Amazon EC2 Instances at -discounted rates. They allow customers to bid on unused Amazon EC2 capacity and -run those instances for as long as their bid exceeds the current Spot Price. - -We can take advantage of these savings and offer people a way to run relays and -bridges on the Amazon cloud with little or no technical experties. -The Tor project would maintain it's own AMI on Amaozn S3 which public can -launch and quickly add capacity to the Tor network. - -We should offer a number of Pricing and Bandwidth tiers. We can have packages -as low as $10/month. (needs to be re-calculated and tested) - - -AMI - Ubuntu on Amazon EC2 -Canonical, the corporation behind Ubuntu operating system maintains an updated -AMI of the latest versions of Ubuntu operating system. We can create our scripts -to work with these official nodes: http://cloud.ubuntu.com/ami/ - -There AMIs are total of 5 datacenters in 4 countries in the world, we should -come up with a plan to distribute our Amazon cloud nodes among all 5 locations: - -Countires: -USA, Ireland, Tokyo, Singapore - -Datacenteres: -- asia pacific northeast-1 -- asia pacific southeast-1 -- europe-west-1 -- us-east-1 -- us-west-1 - - -TODO: we must change the design, so each instance is owned by a separate Amazon account, rather than having them all -under one dev-pay account! - -Amazon Dev-Pay - easy billing and payment processing - -We can take advantage of Amazon Dev-Pay in order to make the process of -launching Tor nodes seamless to the user. -We will create a webpage with a few options to launch Tor Cloud AMIs. -We will have 1 option creted for lowest possible dollar amount and 2 or -more with higher bandwidth and resources. Tor can add a surcharge to this -product in order to also generate income, while growing the Tor network. -At minimum we should charge the cost of dev-pay which is about 3%. - - -We want to minimize the number of steps to enhance the usability of this -service, Proposed steps: - -1. Login to cloud.torproject.org -2. Select desired Tor image. -3. login with amazon account/signup for amazon account -4. Start Node. -5. Stop/Paus Node. - - - -Requirements: - -- Dedicated amazon account for dev-pay purpose only -- Build machines -- Sign up for dev-pay with amazon -- register a product -- create AMI -- associate AMI with product -- create website at: cloud.torproject.org - - -Design: 20 hours of design -Programming: 40 hours -Testing: 20 hours -