From c42a1054415ece95c94d279e13ba55dc65a47177 Mon Sep 17 00:00:00 2001
From: Thach Mai <thachmai@gmail.com>
Date: Sun, 15 Nov 2015 18:05:08 +0100
Subject: [PATCH 1/2] Fix Vagrantfile to fix build issues

Changed the box from "chef/ubuntu-12.04" to "ubuntu/trusty64".
Changed the ruby version to 2.2.2 to accommodate the latest middleman.
Changed initialization from "bundle" to "make dev".
---
 website/Vagrantfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/website/Vagrantfile b/website/Vagrantfile
index 0cdf78d94..b0c4d4d0c 100644
--- a/website/Vagrantfile
+++ b/website/Vagrantfile
@@ -5,22 +5,22 @@ $script = <<SCRIPT
 sudo apt-get -y update
 
 # RVM/Ruby
-sudo apt-get -y install curl
-sudo apt-get -y install git
+sudo apt-get -qy install curl git libgmp3-dev
 gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
+# Install rvm and the latest version of ruby
 curl -sSL https://get.rvm.io | bash -s stable
 . ~/.bashrc
 . ~/.bash_profile
-rvm install 2.0.0
-rvm --default use 2.0.0
+rvm install ruby-2.2.2
+gem install bundler
 
 # Middleman deps
 cd /vagrant
-bundle
+make dev
 SCRIPT
 
 Vagrant.configure(2) do |config|
-  config.vm.box = "chef/ubuntu-12.04"
+  config.vm.box = "ubuntu/trusty64"
   config.vm.network "private_network", ip: "33.33.30.10"
   config.vm.provision "shell", inline: $script, privileged: false
   config.vm.synced_folder ".", "/vagrant", type: "rsync"

From 755407c1d3e13c30979b4a47c53d4edddf6ec0b4 Mon Sep 17 00:00:00 2001
From: Thach MAI <thachmai@gmail.com>
Date: Tue, 17 Nov 2015 09:26:07 +0100
Subject: [PATCH 2/2] Changes box to bento/ubuntu-14.04 to support VMWare.

---
 website/Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/Vagrantfile b/website/Vagrantfile
index b0c4d4d0c..60d6b5ea2 100644
--- a/website/Vagrantfile
+++ b/website/Vagrantfile
@@ -20,7 +20,7 @@ make dev
 SCRIPT
 
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "bento/ubuntu-14.04"
   config.vm.network "private_network", ip: "33.33.30.10"
   config.vm.provision "shell", inline: $script, privileged: false
   config.vm.synced_folder ".", "/vagrant", type: "rsync"