Merge remote-tracking branch 'upstream/pull/5318'

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 7b033146c2420a3f01a50c4754fb54caea4a35ab..617bd7b4d0884707e8f94fc1af38ffd5671523ba 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,32 +1,31 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-
 Vagrant.configure("2") do |config|
-  config.vm.provider "virtualbox" do |vb|
-    vb.customize ["modifyvm", :id, "--memory", "8192"]
-  end
-end
+  # use official debian image
+  config.vm.box = "debian/bookworm64"
 
-Vagrant.configure("2") do |config|
-  # use official ubuntu image for virtualbox
+  # configure virtualbox provider
   config.vm.provider "virtualbox" do |vb, override|
-    override.vm.box = "ubuntu/trusty64"
     override.vm.synced_folder ".", "/srv/openstreetmap-website"
-    vb.customize ["modifyvm", :id, "--memory", "1024"]
+    vb.customize ["modifyvm", :id, "--memory", "4096"]
     vb.customize ["modifyvm", :id, "--cpus", "2"]
+    vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]
   end
 
-  # use third party image and NFS sharing for lxc
+  # Use sshfs sharing if available, otherwise NFS sharing
+  sharing_type = Vagrant.has_plugin?("vagrant-sshfs") ? "sshfs" : "nfs"
+
+  # configure lxc provider
   config.vm.provider "lxc" do |_, override|
-    override.vm.box = "sputnik13/trusty64"
-    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
+    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
   end
 
-  # use third party image and NFS sharing for libvirt
-  config.vm.provider "libvirt" do |_, override|
-    override.vm.box = "sputnik13/trusty64"
-    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs"
+  # configure libvirt provider
+  config.vm.provider "libvirt" do |libvirt, override|
+    override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type
+    libvirt.memory = 4096
+    libvirt.cpus = 2
   end
 
   # configure shared package cache if possible