Update pieces of the README

Author: alexcrichton

README.md

@@ -33,84 +33,68 @@ To see a list of attributes, use `~help`:
 
 ## System Requirements
 
-Rust-Playpen currently needs to be run on a system with access to Docker.
+Currently needs to be run on a system with access to Docker.
 
-## IRC Bot Setup
-
-#### Create `bitly_key`
-
-The bot uses [bitly](https://bitly.com) as a URL shortener. Get an OAuth access token, and put it into a file called `bitly_key`, in the root directory of `rust-playpen`.
-
-#### Modify `playbot.toml`
-
-You'll also need to change the file `playbot.toml`. This configuration allows
-the bot's nick to be registered, and can include the nick's password.
+## Running the web server
 
-#### Registering and starting services
+First, create the Docker images that playpen will use:
 
-The working playpen has the IRC and Web services set up to automatically start at boot:
+```
+sh docker/build.sh
+```
 
-`/etc/systemd/system/rust-playpen-irc.service`
+Next, spin up the server.
 
 ```
-[Unit]
-Description=Rust code evaluation sandbox (irc bots)
-After=network.target
+cargo run --bin playpen
+```
 
-[Service]
-ExecStart=/root/rust-playpen/bot.py
+You should now be able to browse http://127.0.0.1:8080 and interact.
 
-[Install]
-WantedBy=multi-user.target
-```
+## IRC Bot Setup
 
-`/etc/systemd/system/rust-playpen-web.service`
+You'll need to move `playbot.toml.example` to `playbot.toml` and then configure
+it appropriately.
 
-```
-[Unit]
-Description=Rust code evaluation sandbox (web frontend)
-After=network.target
+# Setting up the play.rust-lang.org server
 
-[Service]
-ExecStart=/root/rust-playpen/web.py
+First off, start off with a fresh Ubuntu AMI. These should be listed on
+https://cloud-images.ubuntu.com/locator/ec2/, and the current one is the Xenial
+us-west-1 64-bit hvm ebs-ssd server, ami-08490c68.
 
-[Install]
-WantedBy=multi-user.target
-```
+* Launch an m3.medium instance
+* Launch into EC2-Classic
+* Protect against accidental termination
+* Make the disk ~100GB
+* Use the existing playground security group
 
-`/etc/systemd/system/rust-playpen-update.service`
+SSH through the bastion, then:
 
 ```
-[Unit]
-Description=Playpen sandbox root updater
-
-[Service]
-Type=oneshot
-ExecStart=/root/rust-playpen/init.sh
-Environment=HOME=/root
+sudo apt-get update
+sudo apt-get install python-pip apt-transport-https ca-certificates
+sudo pip install pygments
+
+curl https://sh.rustup.rs | sh
+git clone https://github.com/rust-lang/rust-playpen
+
+# see https://docs.docker.com/engine/installation/linux/ubuntulinux/
+sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+echo 'deb https://apt.dockerproject.org/repo ubuntu-xenial main' | sudo tee /etc/apt/sources.list.d/docker.list
+sudo apt-get update
+sudo apt-get install linux-image-extra-$(uname -r) docker-engine
+sudo service docker start
+sudo usermod -aG docker ubuntu
 ```
 
-`/etc/systemd/system/rust-playpen-update.timer`
+Next, configure `playbot.toml` copied from `playbot.toml.example`.
 
-```
-[Unit]
-Description=Playpen sandbox root update scheduler
+Next, open up a screen window (`screen -R`), and spin up two sessions:
 
-[Timer]
-OnBootSec=10min
-OnCalendar=daily
-Persistent=true
-Unit=rust-playpen-update.service
-
-[Install]
-WantedBy=multi-user.target
 ```
-
-If the services fail to start, kick them:
+cargo run --release --bin playpen
+```
 
 ```
-$ systemctl restart rust-playpen-irc.service
-$ systemctl restart rust-playpen-web.service
+cargo run --release --bin playbot
 ```
-
-[playpen]: https://github.com/thestinger/playpen