From 38d9f2f9aecc09af545313c498a586fde23c8352 Mon Sep 17 00:00:00 2001
From: Ryan Uber <ru@ryanuber.com>
Date: Wed, 23 Sep 2015 17:55:31 -0700
Subject: [PATCH] demo/digitalocean: packer parent dir must exist, fix upstart

---
 demo/digitalocean/packer/nomad.packer.json           | 3 ++-
 demo/digitalocean/packer/upstart.nomad               | 2 +-
 demo/digitalocean/terraform/templates/server.hcl.tpl | 5 -----
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 demo/digitalocean/terraform/templates/server.hcl.tpl

diff --git a/demo/digitalocean/packer/nomad.packer.json b/demo/digitalocean/packer/nomad.packer.json
index e011217e9..3f3be5f5c 100644
--- a/demo/digitalocean/packer/nomad.packer.json
+++ b/demo/digitalocean/packer/nomad.packer.json
@@ -25,7 +25,8 @@
         "# Temporarily disabled until public release. Uncomment",
         "# and remove the above file provisioner.",
         "#curl -o /tmp/nomad.zip -L {{ user `bin_url` }}",
-        "sudo unzip -d /usr/local/bin /tmp/nomad.zip"
+        "sudo unzip -d /usr/local/bin /tmp/nomad.zip",
+        "mkdir -p /usr/local/etc/nomad"
       ]
     },
     {
diff --git a/demo/digitalocean/packer/upstart.nomad b/demo/digitalocean/packer/upstart.nomad
index f716df212..371b5d823 100644
--- a/demo/digitalocean/packer/upstart.nomad
+++ b/demo/digitalocean/packer/upstart.nomad
@@ -8,5 +8,5 @@ respawn
 script
     CONFIG_DIR=/usr/local/etc/nomad
     mkdir -p $CONFIG_DIR
-    exec /usr/local/bin/nomad -config $CONFIG_DIR >> /var/log/nomad.log 2>&1
+    exec /usr/local/bin/nomad agent -config $CONFIG_DIR >> /var/log/nomad.log 2>&1
 end script
diff --git a/demo/digitalocean/terraform/templates/server.hcl.tpl b/demo/digitalocean/terraform/templates/server.hcl.tpl
deleted file mode 100644
index 8ebbb9b1e..000000000
--- a/demo/digitalocean/terraform/templates/server.hcl.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-datacenter = "${datacenter}"
-server {
-    enabled = true
-    bootstrap_expect = 3
-}