Merge remote-tracking branch 'upstream/pull/2937' into master

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index b446b5c5f6a679cf744c769e9ab206386433da60..271c0b3f51602e30137abe3dbf411d2fe740bf7f 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,8 +2,31 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|

-  config.vm.box = "sputnik13/trusty64"
+  # use official ubuntu image for virtualbox
+  config.vm.provider "virtualbox" do |vb, override|
+    override.vm.box = "ubuntu/focal64"
+    override.vm.synced_folder ".", "/srv/openstreetmap-website"
+    vb.customize ["modifyvm", :id, "--memory", "1024"]
+    vb.customize ["modifyvm", :id, "--cpus", "2"]
+    vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]
+  end
+
+  # Use sshfs sharing if available, otherwise NFS sharing
+  sharing_type = Vagrant.has_plugin?("vagrant-sshfs") ? "sshfs" : "nfs"
+
+  # use third party image and sshfs or NFS sharing for lxc
+  config.vm.provider "lxc" do |_, override|
+    override.vm.box = "generic/ubuntu2004"
+    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
+  end

 
 

+  # use third party image and sshfs or NFS sharing for libvirt
+  config.vm.provider "libvirt" do |_, override|
+    override.vm.box = "generic/ubuntu2004"
+    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
+  end
+
+  # configure shared package cache if possible

   if Vagrant.has_plugin?("vagrant-cachier")
     config.cache.enable :apt
     config.cache.scope = :box
   if Vagrant.has_plugin?("vagrant-cachier")
     config.cache.enable :apt
     config.cache.scope = :box


@@ -12,10 +35,6 @@ Vagrant.configure("2") do |config|
   # port forward for webrick on 3000
   config.vm.network :forwarded_port, :guest => 3000, :host => 3000
 
   # port forward for webrick on 3000
   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",
-    :rsync__exclude => ["config/application.yml", "config/database.yml"]
-

   # provision using a simple shell script
   config.vm.provision :shell, :path => "script/vagrant/setup/provision.sh"
 end
   # provision using a simple shell script
   config.vm.provision :shell, :path => "script/vagrant/setup/provision.sh"
 end