From 213f9141f3664a8eb6d4ab3c9dc44941e6d82f9c Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro@pietroalbini.org>
Date: Mon, 4 Mar 2019 16:20:44 +0100
Subject: [PATCH] docs: update machine setup docs

---
 docs/agent-machine-setup.md | 46 ++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/docs/agent-machine-setup.md b/docs/agent-machine-setup.md
index 6dbbff363..51b1ad6fa 100644
--- a/docs/agent-machine-setup.md
+++ b/docs/agent-machine-setup.md
@@ -1,14 +1,19 @@
 # Setting up a new Crater agent machine
 
 This document contains the steps to configure a new Crater agent machine from
-scratch, from an Amazon Linux image. To get a new one ask in `#rust-infra`.
+scratch, from an Amazon Linux image. To get a new one ask [in
+`#infra`][discord].
 
 The machine type we're currently using is:
 
 * Instance: AWS `c5.2xlarge`
-* Storage: 2 Tb
+* Storage: 4 Tb
 * OS: Amazon Linux 2
 
+You might need to create a smaller root partition and attach the 4 Tb disk on
+another directory since we had problems mounting partitions bigger than 2 Tb on
+the root directory.
+
 Once they tell you the IP of the machine, ssh with the `ec2-user` user into it
 from the bastion server, and execute these commands:
 
@@ -16,32 +21,35 @@ from the bastion server, and execute these commands:
 curl https://sh.rustup.rs -sSf | sh
 source $HOME/.cargo/env
 sudo yum install git htop docker gcc cmake openssl-devel
-sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-sudo yum install --enablerepo=epel byobu
 sudo systemctl start docker
 sudo systemctl enable docker
 sudo usermod -a -G docker ec2-user
-
-# Configure byobu to use Ctrl+Z instead of Ctrl+A
-mkdir ~/.byobu
-cat > ~/.byobu/keybindings.tmux << EOF
-unbind-key -n C-a
-unbind-key -n C-z
-set -g prefix ^Z
-set -g prefix2 ^Z
-bind z send-prefix
-EOF
 ```
 
-Log out of the machine. From the bastion, copy the `~/.aws/credentials` file
-from an existing agent into the new one, and then log into it again and
-execute:
+Log out of the machine and log in again, executing these commands:
 
 ```
 git clone https://github.com/rust-lang-nursery/crater
 cd crater
 cargo build --release
 
-# This is going to take a while to complete
-cargo run --release -- prepare-local
+cat > /etc/systemd/system/crater-agent.service << EOF
+[Unit]
+Description = Crater agent
+
+[Service]
+ExecStart=/home/ec2-user/crater/target/release/crater agent https://crater.rust-lang.org <TOKEN> --threads 8
+Restart=on-failure
+User=ec2-user
+Group=ec2-user
+WorkingDirectory=/home/ec2-user/crater
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+systemctl enable crater-agent
+systemctl start crater-agent
 ```
+
+[discord]: https://discord.gg/AxXmxzN