X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/91219bb3dd7c82ce0875dc7213e8eb4d172af313..73953cbac95847740339d7a5ee3c0e5f142d93c5:/Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index dff597d6..033e1507 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,25 +12,25 @@ Vagrant.configure("2") do |config|
   # Never sync the current directory to /vagrant.
   config.vm.synced_folder ".", "/vagrant", disabled: true
 
-
   checkout = "yes"
+  if ENV['CHECKOUT'] != 'y' then
+    checkout = "no"
+  end
 
-  config.vm.provider "virtualbox" do |vb|
+  config.vm.provider "virtualbox" do |vb, override|
     vb.gui = false
     vb.memory = 2048
     vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"]
     if ENV['CHECKOUT'] != 'y' then
-      config.vm.synced_folder ".", "/home/vagrant/Nominatim"
-      checkout = "no"
+      override.vm.synced_folder ".", "/home/vagrant/Nominatim"
     end
   end
 
-  config.vm.provider "libvirt" do |lv|
+  config.vm.provider "libvirt" do |lv, override|
     lv.memory = 2048
     lv.nested = true
     if ENV['CHECKOUT'] != 'y' then
-      config.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs'
-      checkout = "no"
+      override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs'
     end
   end
 
@@ -43,6 +43,24 @@ Vagrant.configure("2") do |config|
       end
   end
 
+  config.vm.define "ubuntu-apache" do |sub|
+      sub.vm.box = "generic/ubuntu2004"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/Install-on-Ubuntu-20.sh"
+        s.privileged = false
+        s.args = [checkout, "install-apache"]
+      end
+  end
+
+  config.vm.define "ubuntu-nginx" do |sub|
+      sub.vm.box = "generic/ubuntu2004"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/Install-on-Ubuntu-20.sh"
+        s.privileged = false
+        s.args = [checkout, "install-nginx"]
+      end
+  end
+
   config.vm.define "ubuntu18" do |sub|
       sub.vm.box = "generic/ubuntu1804"
       sub.vm.provision :shell do |s|
@@ -70,24 +88,22 @@ Vagrant.configure("2") do |config|
       end
   end
 
-  config.vm.define "centos" do |sub|
+  config.vm.define "centos7" do |sub|
       sub.vm.box = "centos/7"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Centos-7.sh"
         s.privileged = false
-        s.args = "yes"
+        s.args = [checkout]
       end
-      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true
   end
 
-  config.vm.define "centos8" do |sub|
+  config.vm.define "centos" do |sub|
       sub.vm.box = "generic/centos8"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Centos-8.sh"
         s.privileged = false
-        s.args = "yes"
+        s.args = [checkout]
       end
-      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true
   end