Ngs2014

.gitignore

@@ -4,7 +4,6 @@
 *.egg
 *.egg-info
 dist
-build
 eggs
 parts
 bin

amazon/index.txt

@@ -1,26 +1,15 @@
-===============================
-Getting started with Amazon EC2
-===============================
+Amazon Web Services instructions
+================================
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 5
 
    start-up-an-ec2-instance
-   log-in-with-ssh-win
    log-in-with-ssh-mac
-
+   log-in-with-ssh-win
    installing-dropbox
+   terminating-your-instance.txt
 
-A final checklist:
-
-- EC2 instance is running;
-- used AMI ami-7f340c16;
-- NOT micro instance (m1.large, or bigger);
-- SSH, HTTP, HTTPS are enabled on the security group;
-
-Amazon Web Services reference material
---------------------------------------
-
-`Instance types <http://aws.amazon.com/ec2/instance-types/>`__
-
-`Instance costs <http://aws.amazon.com/ec2/pricing/>`__
+   starting-up-a-custom-ami
+   technical-guide
+   using-screen

amazon/installing-dropbox.txt

@@ -21,11 +21,13 @@ Make the Dropbox directory on /mnt and link it in::
 
    mkdir /mnt/Dropbox
    ln -fs /mnt/Dropbox /root
-   ln -fs /mnt/Dropbox /home/ubuntu
 
-and then run it::
+and then run it, configuring it to put stuff in /mnt::
 
-   /root/.dropbox-dist/dropboxd &
+   HOME=/mnt /root/.dropbox-dist/dropboxd &
 
 When you get a message saying "this client is not linked to any account",
 copy/paste the URL into browser and go log in.  Voila!
+
+Your directory '/root/Dropbox', or, equivalently, '/mnt/Dropbox', is now
+linked to your Dropbox account!

amazon/log-in-with-ssh-mac.txt

@@ -24,24 +24,32 @@ to set the permissions on the private key file to "closed to all evildoers".
 
 Then type::
 
-  ssh -i ~/Desktop/amazon.pem root@ec2-???-???-???-???.compute-1.amazonaws.com
+  ssh -i ~/Desktop/amazon.pem ubuntu@ec2-???-???-???-???.compute-1.amazonaws.com
 
+(but you have to replace the stuff after the '@' sign with the name of the host).
 
-Here, you're logging in as user 'root' to the machine
+Here, you're logging in as user 'ubuntu' to the machine
 'ec2-174-129-122-189.compute-1.amazonaws.com' using the authentication
 key located in 'amazon.pem' on your Desktop.
 
+You should now see a text line that starts with something like
+``ubuntu@ip-10-235-34-223:~$``.  You're in!  Now type::
 
-Note, you have to replace the stuff after the '@' sign with the name
-of the host; see the red circle in:
+   sudo bash
+   cd /root
 
-.. image:: images/ec2-dashboard-instance-name.png
-   :width: 50%
+to switch into superuser mode (see: http://xkcd.com/149/) and go to your
+home directory.
 
-----
+This is where the rest of the tutorials will start!
 
-At the end you should see text and a prompt that look like this:
+If you have Dropbox, you should now visit :doc:`installing-dropbox`.
 
+You might also want to read about :doc:`terminating-your-instance`.
 
-.. image:: images/win-putty-4.png
-   :width: 50%
+To log out, type::
+
+   exit
+   logout
+
+or just close the window.

amazon/log-in-with-ssh-win.txt

@@ -7,7 +7,7 @@ Download Putty and Puttygen from here: http://www.chiark.greenend.org.uk/~sgtath
 Generate a ppk file from your pem file
 ======================================
 
-(You only need to do this once for each key!)
+(You only need to do this once!)
 
 Open puttygen; select "Load".
 
@@ -30,9 +30,6 @@ Now, "save private key".  Put it somewhere easy to find.
 .. image:: images/win-puttygen-4.png
    :width: 50%
 
-Now that you've generated your PPK file from your PEM file, you can log
-in.  To do that...
-
 Logging into your EC2 instance with Putty
 =========================================
 
@@ -47,7 +44,7 @@ by puttygen).  Then select 'Open'.
 .. image:: images/win-putty-2.png
    :width: 50%
 
-Log in as "root".
+Log in as "ubuntu".
 
 .. image:: images/win-putty-3.png
    :width: 50%
@@ -57,3 +54,28 @@ Declare victory!
 .. image:: images/win-putty-4.png
    :width: 50%
 
+Here, you're logging in as user 'ubuntu' to the machine
+'ec2-174-129-122-189.compute-1.amazonaws.com' using the authentication
+key located in 'amazon.pem' on your Desktop.
+
+You should now see a text line that starts with something like
+``ubuntu@ip-10-235-34-223:~$``.  You're in!  Now type::
+
+   sudo bash
+   cd /root
+
+to switch into superuser mode (see: http://xkcd.com/149/) and go to your
+home directory.
+
+This is where the rest of the tutorials will start!
+
+If you have Dropbox, you should now visit :doc:`installing-dropbox`.
+
+You might also want to read about :doc:`terminating-your-instance`.
+
+To log out, type::
+
+   exit
+   logout
+
+or just close the window.