From 29dbb1de1bbb74bf08dcfbf235f8a553bd03cbe4 Mon Sep 17 00:00:00 2001
From: Luke Faraone <luke@faraone.cc>
Date: Thu, 23 May 2013 15:06:13 -0400
Subject: [PATCH] Expand install-server to run some additional required steps.

(imported from commit 22719e7a4ea62c8830c502052ec5547a1b3cf726)
---
 servers/install-server | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/servers/install-server b/servers/install-server
index 60d5858c95..1aeaa112b9 100755
--- a/servers/install-server
+++ b/servers/install-server
@@ -70,11 +70,12 @@ EOF
 # Stupid hack because humbug-self-signed.key isn't in git
 scp -i "$amazon_key_file" "$humbug_cert_file" root@"$server":/root/humbug/certs/humbug-self-signed.key
 
-# TODO: Copy the real certs into place for prod servers
-
 ssh "$server" -t -i "$amazon_key_file" -lroot <<EOF
+cp -a /root/humbug/certs/ /etc/ssl/
 cp -a /root/humbug/servers/puppet/modules/humbug/files/puppet.conf /etc/puppet/
 puppet apply -e 'class {"humbug": machinetype => "$type"}'
+cp -a /root/humbug /home/humbug/humbug
+chown -R humbug:humbug /home/humbug/humbug
 # These server restarting bits should be moveable into puppet-land, ideally
 apt-get -y upgrade
 if [ -e "/etc/init.d/nginx" ]; then