From 0546ebb7b0ad3cd9ee904fa988908dde676d9596 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 31 May 2015 14:53:02 +0100 Subject: [PATCH] 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. --- Vagrantfile | 6 +++--- script/vagrant/setup/provision.sh | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index c087c0cf4..b446b5c5f 100644 --- 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 9cbe7849b..912a62958 100644 --- 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 -- 2.39.5