Upgrade vagrant config to use Ubuntu 14.04

This uses the sputnik13/trusty64 image rather then the official
ubuntu/trusty64 image in order to get libvirt provider support as
wall as virtualbox provider support.

diff --git a/Vagrantfile b/Vagrantfile
index c087c0cf40cf046a820c4663971d569e1a65003f..b446b5c5f6a679cf744c769e9ab206386433da60 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,8 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "precise64"
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+  config.vm.box = "sputnik13/trusty64"
 
   if Vagrant.has_plugin?("vagrant-cachier")
     config.cache.enable :apt
@@ -14,7 +13,8 @@ Vagrant.configure("2") do |config|
   config.vm.network :forwarded_port, :guest => 3000, :host => 3000
 
   # set up synced folder to source in /srv/openstreetmap-website
-  config.vm.synced_folder ".", "/srv/openstreetmap-website"
+  config.vm.synced_folder ".", "/srv/openstreetmap-website",
+    :rsync__exclude => ["config/application.yml", "config/database.yml"]
 
   # provision using a simple shell script
   config.vm.provision :shell, :path => "script/vagrant/setup/provision.sh"

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 9cbe7849bcddc6b35abf5ba6f2b6169b697775ef..912a62958af73f9c86b3071800d0c469a785b89c 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -9,16 +9,6 @@ export LC_ALL=en_GB.utf8
 # make sure we have up-to-date packages
 apt-get update
 
-## vagrant grub-pc fix from: https://gist.github.com/jrnickell/6289943
-# parameters
-echo "grub-pc grub-pc/kopt_extracted boolean true" | debconf-set-selections
-echo "grub-pc grub2/linux_cmdline string" | debconf-set-selections
-echo "grub-pc grub-pc/install_devices multiselect /dev/sda" | debconf-set-selections
-echo "grub-pc grub-pc/install_devices_failed_upgrade boolean true" | debconf-set-selections
-echo "grub-pc grub-pc/install_devices_disks_changed multiselect /dev/sda" | debconf-set-selections
-# vagrant grub fix
-dpkg-reconfigure -f noninteractive grub-pc
-
 # upgrade all packages
 apt-get upgrade -y