[tor-commits] [tor-cloud/master] Destroy the ec2-prep script before we reboot, solves #4450

[runa at torproject.org]

commit 6651d494d1522c722015b1ca224f37d5a398e817
Author: Runa A. Sandvik <runa.sandvik at gmail.com>
Date:   Sun Nov 13 11:42:03 2011 +0000

    Destroy the ec2-prep script before we reboot, solves #4450
---
 ec2-prep.sh |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ec2-prep.sh b/ec2-prep.sh
index 8a436c4..de985cd 100644
--- a/ec2-prep.sh
+++ b/ec2-prep.sh
@@ -21,6 +21,11 @@ echo "root required; re-run with sudo";
   exit 1;
 fi
 
+# Get the latest package updates
+echo "Updating the system..."
+aptitude update
+aptitude -y safe-upgrade
+
 # Configure unattended-upgrades. The system will automatically download,
 # install and configure all packages, and reboot if necessary.
 echo "Configuring the unattended-upgrades package..."
@@ -44,7 +49,7 @@ EOF
 cat << EOF > $UNATTENDED_UPGRADES
 // Automatically upgrade packages from these (origin, archive) pairs
 Unattended-Upgrade::Allowed-Origins {
-        "Ubuntu lucid";
+    "Ubuntu lucid";
 	"Ubuntu lucid-security";
 	"Ubuntu lucid-updates";
 	"Tor lucid";
@@ -109,9 +114,8 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
 
 # Install Tor
 echo "Installing Tor...";
-aptitude safe-upgrade -y
-apt-get -y update 
-apt-get -y install tor tor-geoipdb
+aptitude update
+aptitude -y install tor tor-geoipdb
 
 # Configure Tor
 echo "Configuring Tor...";
@@ -184,10 +188,8 @@ fi
 
 # XXX TODO
 # Generally, we'll want to rm /var/lib/tor/* and remove all state from the system
-echo "Restarting Tor...";
-/etc/init.d/tor restart
-update-rc.d tor enable
-
+#
 # We're done; tell the user and then reboot the system
 echo "Done configuring the system, will reboot"
+echo "Your system has been configured as a Tor bridge, see https://cloud.torproject.org/ for more info" > /etc/ec2-prep.sh
 reboot