clean up some of the vagrant scripts.

2 files changed, 4 insertions, 33 deletions

diff --git a/Vagrantfile b/Vagrantfile
index 8a5cdb45..d90901b5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,34 +3,9 @@
 
 Vagrant.configure("2") do |config|
   config.vm.box = "phusion/ubuntu-14.04-amd64"
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  #config.vm.network :forwarded_port, guest: 80, host: 8080
-  config.vm.network :forwarded_port, guest: 3000, host: 3000
-  config.vm.provision :shell, :path => 'script/bootstrap.sh'
-  config.ssh.forward_agent = true
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
+  config.vm.provision :shell, path: 'script/bootstrap.sh'
   config.vm.network :private_network, ip: "192.168.33.10"
 
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network :public_network
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
   # config.vm.provider :virtualbox do |vb|
   #   # Don't boot with headless mode
   #   vb.gui = true
@@ -38,8 +13,4 @@ Vagrant.configure("2") do |config|
   #   # Use VBoxManage to customize the VM. For example to change memory:
   #   vb.customize ["modifyvm", :id, "--memory", "1024"]
   # end
-  config.vm.provider :vmware_workstation do |vm|
-    vm.gui = false
-    vm.vmx["displayname"] = "cakeside"
-  end
 end
diff --git a/script/bootstrap-vagrant-user.sh b/script/bootstrap-vagrant-user.sh
index 0baf50c0..09dc646f 100644
--- a/script/bootstrap-vagrant-user.sh
+++ b/script/bootstrap-vagrant-user.sh
@@ -7,12 +7,12 @@ git clone https://github.com/tpope/rbenv-ctags.git ~/.rbenv/plugins/rbenv-ctags
 git clone https://github.com/rkh/rbenv-update.git ~/.rbenv/plugins/rbenv-update
 git clone https://github.com/sstephenson/rbenv-gem-rehash.git ~/.rbenv/plugins/rbenv-gem-rehash
 rbenv update
-rbenv install 2.2.0
-rbenv global 2.2.0
+rbenv install 2.4.1
+rbenv global 2.4.1
 gem install bundler --no-ri --no-rdoc
 rbenv rehash
 cd /vagrant
-bundle install -j 4
+bundle install -j 4 --path vendor/bundle
 rbenv rehash
 if [ ! -f config/database.yml ]; then
   ln -s config/database.yml.vagrant config/database.yml