Merge remote-tracking branch 'upstream/master'

[nominatim.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 09e7eab9361271c1e623099d46b5d21b8d497745..b9d618e20f8434c07a9c1acb51a683128cf843fc 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,21 +8,37 @@ Vagrant.configure("2") do |config|
   # If true, then any SSH connections made will enable agent forwarding.
   config.ssh.forward_agent = true
 
   # If true, then any SSH connections made will enable agent forwarding.
   config.ssh.forward_agent = true
 

+  checkout = "yes"

   if ENV['CHECKOUT'] != 'y' then
       config.vm.synced_folder ".", "/home/vagrant/Nominatim"
   if ENV['CHECKOUT'] != 'y' then
       config.vm.synced_folder ".", "/home/vagrant/Nominatim"

+      checkout = "no"

   end
 
   end
 

-  config.vm.define "ubuntu" do |sub|
-      sub.vm.box = "ubuntu/trusty64"
-      sub.vm.provision :shell, :path => "vagrant/ubuntu-trusty-provision.sh"
+  config.vm.define "ubuntu", primary: true do |sub|
+      sub.vm.box = "bento/ubuntu-16.04"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/install-on-ubuntu-16.sh"
+        s.privileged = false
+        s.args = [checkout]
+      end

   end
   end

-  config.vm.define "ubuntu-php7" do |sub|
-      sub.vm.box = "ubuntu/trusty64"
-      sub.vm.provision :shell, :path => "vagrant/ubuntu-trusty-php7-provision.sh"
+
+  config.vm.define "travis" do |sub|
+      sub.vm.box = "bento/ubuntu-14.04"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/install-on-travis-ci.sh"
+        s.privileged = false
+        s.args = [checkout]
+      end

   end
   end

-  config.vm.define "centos" do |sub|
+
+   config.vm.define "centos" do |sub|

       sub.vm.box = "bento/centos-7.2"
       sub.vm.box = "bento/centos-7.2"

-      sub.vm.provision :shell, :path => "vagrant/install-on-centos-7.sh"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/install-on-centos-7.sh"
+        s.privileged = false
+        s.args = [checkout]
+      end

   end
 
   # configure shared package cache if possible
   end
 
   # configure shared package cache if possible