commit 05a2bebdb2597b94e8390f40ef883bd97e770559 Author: Runa A. Sandvik <runa.sandvik@gmail.com> Date: Tue Aug 28 00:44:05 2012 +0100 new config for blocking diagnostics --- ec2-prep.sh | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 331017c..3f5b615 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -230,10 +230,11 @@ aptitude -y install tor tor-geoipdb tor-arm echo "Configuring Tor..."; cp /etc/tor/torrc /etc/tor/torrc.bkp +# Normal bridge if [ $CONFIG == "bridge" ]; then echo "Configuring Tor as a $CONFIG"; cat << EOF > $CONFIG_FILE -# Auto generated public Tor $CONFIG config file +# Auto generated Tor $CONFIG config file # A unique handle for your server. Nickname ec2$CONFIG$RESERVATION @@ -267,10 +268,11 @@ echo "Your system has been configured as a Tor bridge, see https://cloud.torproj reboot fi +# Private bridge if [ $CONFIG == "privatebridge" ]; then echo "Configuring Tor as a $CONFIG"; cat << EOF > $CONFIG_FILE -# Auto generated public Tor $CONFIG config file +# Auto generated Tor $CONFIG config file # A unique handle for your server. Nickname ec2priv$RESERVATION @@ -305,6 +307,33 @@ echo "Your system has been configured as a private Tor bridge, see https://cloud reboot fi +# Blocking diagnostics (private bridge and then some) +if [ $CONFIG == "blockingdiagnostics" ]; then +echo "Configuring a Tor blocking diagnostics image"; + +# Configure Tor to run as a private bridge +cat << EOF > $CONFIG_FILE +SocksPort 0 +ORPort 443 +ORListenAddress 0.0.0.0:9001 +BridgeRelay 1 +PublishServerDescriptor 0 +Log info file /var/log/tor/info.log +AccountingStart week 1 10:00 +AccountingMax 10 GB +ExitPolicy reject *:* +EOF + +# Run tcpdump on boot +cat << EOF > /etc/rc.local +#!/bin/sh -e +sudo screen tcpdump -v -i any -s 0 -w /root/bridge_test.cap +EOF +echo "Done configuring the system, will reboot" +echo "Your system has been configured for blocking diagnostics" > /etc/ec2-prep.sh +reboot +fi + # XXX TODO # Generally, we'll want to rm /var/lib/tor/* and remove all state from the system #