From 21c2a7a44021f61e1973508d5216ba6d93193977 Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Thu, 30 Oct 2014 16:36:03 -0400
Subject: [PATCH] More Vagrant stuff.

---
 Makefile    | 2 +-
 Vagrantfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c382d4c..0a1d9c9 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ vagrant:
 	@$(ssh-vagrant) 'sudo mv ~/salt /srv/salt'
 	@$(ssh-vagrant) 'sudo mv ~/pillar /srv/pillar'
 	@$(ssh-vagrant) 'sudo salt-call --local state.highstate'
-	@$(ssh-vagrant) 'cd /var/www/snipt; make db;'
+	@vagrant ssh -c 'cd /var/www/snipt; make db;'
 	@vagrant ssh -c '$(pm) syncdb;'
 	@$(ssh-vagrant) '$(pm) migrate;'
 	@$(ssh-vagrant) '$(pm) backfill_api_keys'
diff --git a/Vagrantfile b/Vagrantfile
index e1ce2db..fa6b204 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,5 +1,5 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "puphpet/ubuntu1404-x64"
+  config.vm.box = "phusion/ubuntu-14.04-amd64"
   config.vm.hostname = "local.snipt.net"
   config.vm.synced_folder ".", "/var/www/snipt/"
   config.vm.network "forwarded_port", guest: 80, host: 80