Merge remote-tracking branch 'upstream/master'

[nominatim.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index b9d618e20f8434c07a9c1acb51a683128cf843fc..87118c43524dbc9a66934afa9053ec84c54b1b32 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -15,9 +15,36 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.define "ubuntu", primary: true do |sub|
   end
 
   config.vm.define "ubuntu", primary: true do |sub|

+      sub.vm.box = "bento/ubuntu-20.04"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/Install-on-Ubuntu-20.sh"
+        s.privileged = false
+        s.args = [checkout]
+      end
+  end
+
+  config.vm.define "ubuntu18", primary: true do |sub|
+      sub.vm.box = "bento/ubuntu-18.04"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/Install-on-Ubuntu-18.sh"
+        s.privileged = false
+        s.args = [checkout]
+      end
+  end
+
+  config.vm.define "ubuntu18nginx" do |sub|
+      sub.vm.box = "bento/ubuntu-18.04"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/Install-on-Ubuntu-18-nginx.sh"
+        s.privileged = false
+        s.args = [checkout]
+      end
+  end
+
+  config.vm.define "ubuntu16" do |sub|

       sub.vm.box = "bento/ubuntu-16.04"
       sub.vm.provision :shell do |s|
       sub.vm.box = "bento/ubuntu-16.04"
       sub.vm.provision :shell do |s|

-        s.path = "vagrant/install-on-ubuntu-16.sh"
+        s.path = "vagrant/Install-on-Ubuntu-16.sh"

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


@@ -32,38 +59,33 @@ Vagrant.configure("2") do |config|
       end
   end
 
       end
   end
 

-   config.vm.define "centos" do |sub|
-      sub.vm.box = "bento/centos-7.2"
+  config.vm.define "centos" do |sub|
+      sub.vm.box = "centos/7"

       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-Centos-7.sh"

         s.privileged = false
         s.privileged = false

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

       end
       end

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

   end
 
   end
 

-  # configure shared package cache if possible
-  #if Vagrant.has_plugin?("vagrant-cachier")
-  #  config.cache.enable :apt
-  #  config.cache.scope = :box
-  #end
+  config.vm.define "centos8" 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"
+      end
+      sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true
+      sub.vm.synced_folder ".", "/vagrant", disabled: true
+  end

 
 
   config.vm.provider "virtualbox" do |vb|
     vb.gui = false
 
 
   config.vm.provider "virtualbox" do |vb|
     vb.gui = false

-    vb.customize ["modifyvm", :id, "--memory", "2048"]
+    vb.memory = 2048
+    vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"]

   end
 
   end
 

-
-  # config.vm.provider :digital_ocean do |provider, override|
-  #   override.ssh.private_key_path = '~/.ssh/id_rsa'
-  #   override.vm.box = 'digital_ocean'
-  #   override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"
-
-  #   provider.token = ''
-  #   # provider.token = 'YOUR TOKEN'
-  #   provider.image = 'ubuntu-14-04-x64'
-  #   provider.region = 'nyc2'
-  #   provider.size = '512mb'
-  # end
-

 end
 end