Merge remote-tracking branch 'upstream/master'

[nominatim.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index dff597d69daf56d9541ab914fb80079245cf7133..0cc511c53802cc53bebdf8465819dfb49d22ef07 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,83 +12,115 @@ Vagrant.configure("2") do |config|
   # Never sync the current directory to /vagrant.
   config.vm.synced_folder ".", "/vagrant", disabled: true
 
   # Never sync the current directory to /vagrant.
   config.vm.synced_folder ".", "/vagrant", disabled: true
 

-

   checkout = "yes"
   checkout = "yes"

+  if ENV['CHECKOUT'] != 'y' then
+    checkout = "no"
+  end

 
 

-  config.vm.provider "virtualbox" do |vb|
+  config.vm.provider "hyperv" do |hv, override|
+    hv.memory = 2048
+    hv.linked_clone = true
+    if ENV['CHECKOUT'] != 'y' then
+      override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: "smb", smb_host: ENV['SMB_HOST'] || ENV['COMPUTERNAME']
+    end
+  end
+
+  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
     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
 
     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
     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
 
     end
   end
 

-  config.vm.define "ubuntu", primary: true do |sub|
-      sub.vm.box = "generic/ubuntu2004"
+  config.vm.define "ubuntu22", primary: true do |sub|
+      sub.vm.box = "generic/ubuntu2204"

       sub.vm.provision :shell do |s|
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/Install-on-Ubuntu-20.sh"
+        s.path = "vagrant/Install-on-Ubuntu-22.sh"

         s.privileged = false
         s.args = [checkout]
       end
   end
 
         s.privileged = false
         s.args = [checkout]
       end
   end
 

-  config.vm.define "ubuntu18" do |sub|
-      sub.vm.box = "generic/ubuntu1804"
+  config.vm.define "ubuntu22-apache" do |sub|
+      sub.vm.box = "generic/ubuntu2204"

       sub.vm.provision :shell do |s|
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/Install-on-Ubuntu-18.sh"
+        s.path = "vagrant/Install-on-Ubuntu-22.sh"
+        s.privileged = false
+        s.args = [checkout, "install-apache"]
+      end
+  end
+
+  config.vm.define "ubuntu22-nginx" do |sub|
+      sub.vm.box = "generic/ubuntu2204"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/Install-on-Ubuntu-22.sh"
+        s.privileged = false
+        s.args = [checkout, "install-nginx"]
+      end
+  end
+
+  config.vm.define "ubuntu20" 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]
       end
   end
 
         s.privileged = false
         s.args = [checkout]
       end
   end
 

-  config.vm.define "ubuntu18-apache" do |sub|
-      sub.vm.box = "generic/ubuntu1804"
+  config.vm.define "ubuntu20-apache" do |sub|
+      sub.vm.box = "generic/ubuntu2004"

       sub.vm.provision :shell do |s|
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/Install-on-Ubuntu-18.sh"
+        s.path = "vagrant/Install-on-Ubuntu-20.sh"

         s.privileged = false
         s.args = [checkout, "install-apache"]
       end
   end
 
         s.privileged = false
         s.args = [checkout, "install-apache"]
       end
   end
 

-  config.vm.define "ubuntu18-nginx" do |sub|
-      sub.vm.box = "generic/ubuntu1804"
+  config.vm.define "ubuntu20-nginx" do |sub|
+      sub.vm.box = "generic/ubuntu2004"

       sub.vm.provision :shell do |s|
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/Install-on-Ubuntu-18.sh"
+        s.path = "vagrant/Install-on-Ubuntu-20.sh"

         s.privileged = false
         s.args = [checkout, "install-nginx"]
       end
   end
 
         s.privileged = false
         s.args = [checkout, "install-nginx"]
       end
   end
 

-  config.vm.define "centos" do |sub|
-      sub.vm.box = "centos/7"
+  config.vm.define "ubuntu18" do |sub|
+      sub.vm.box = "generic/ubuntu1804"

       sub.vm.provision :shell do |s|
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/Install-on-Centos-7.sh"
+        s.path = "vagrant/Install-on-Ubuntu-18.sh"

         s.privileged = false
         s.privileged = false

-        s.args = "yes"
+        s.args = [checkout]

       end
       end

-      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true

   end
 
   end
 

-  config.vm.define "centos8" do |sub|
-      sub.vm.box = "generic/centos8"
+  config.vm.define "ubuntu18-apache" do |sub|
+      sub.vm.box = "generic/ubuntu1804"

       sub.vm.provision :shell do |s|
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/Install-on-Centos-8.sh"
+        s.path = "vagrant/Install-on-Ubuntu-18.sh"

         s.privileged = false
         s.privileged = false

-        s.args = "yes"
+        s.args = [checkout, "install-apache"]

       end
       end

-      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true

   end
 
   end
 

+  config.vm.define "ubuntu18-nginx" do |sub|
+      sub.vm.box = "generic/ubuntu1804"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/Install-on-Ubuntu-18.sh"
+        s.privileged = false
+        s.args = [checkout, "install-nginx"]
+      end
+  end

 
 end
 
 end