[tor-commits] [tor-cloud/master] Remove support for configuring Tor cloud images as public relays (#5004)

[runa at torproject.org]

commit d59c352223b1e9a599b80d3cbda72b97b86f08bb
Author: Runa A. Sandvik <runa.sandvik at gmail.com>
Date:   Tue Feb 7 10:09:23 2012 +0000

    Remove support for configuring Tor cloud images as public relays (#5004)
---
 ec2-prep.sh |   31 -------------------------------
 1 files changed, 0 insertions(+), 31 deletions(-)

diff --git a/ec2-prep.sh b/ec2-prep.sh
index 8c5f25a..4e6ad88 100644
--- a/ec2-prep.sh
+++ b/ec2-prep.sh
@@ -261,37 +261,6 @@ ExitPolicy reject *:*
 EOF
 fi
 
-if [ $CONFIG == "private-bridge" ]; then
-echo "Configuring Tor as a $CONFIG";
-cat << EOF > $CONFIG_FILE
-# Auto generated public Tor $CONFIG config file
-Nickname ec2$CONFIG$RESERVATION
-SocksPort 0
-ORPort 443
-ORListenAddress 0.0.0.0:9001
-BridgeRelay 1
-PublishServerDescriptor 0
-AccountingStart week 1 10:00
-AccountingMax 10 GB
-Exitpolicy reject *:*
-EOF
-fi
-
-if [ $CONFIG == "middle-relay" ]; then
-echo "Configuring Tor as a $CONFIG";
-cat << EOF > $CONFIG_FILE
-# Auto generated public Tor $CONFIG config file
-Nickname ec2$CONFIG$RESERVATION
-SocksPort 0
-ORPort 443
-ORListenAddress 0.0.0.0:9001
-DirPort 80
-AccountingStart week 1 10:00
-AccountingMax 10 GB
-Exitpolicy reject *:*
-EOF
-fi
-
 # XXX TODO
 # Generally, we'll want to rm /var/lib/tor/* and remove all state from the system
 #