Merge remote-tracking branch 'openstreetmap/pull/954'

[rails.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 24d62bb7a4a95e56a4d2ad01526c6cce533061d2..0cd5ac72aa760553b8fdbada019af56c46cd19b4 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,9 +3,11 @@
 
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
 
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox

-  config.vm.provider "virtualbox" do |_, override|
+  config.vm.provider "virtualbox" do |vb, override|

     override.vm.box = "ubuntu/trusty64"
     override.vm.synced_folder ".", "/srv/openstreetmap-website"
     override.vm.box = "ubuntu/trusty64"
     override.vm.synced_folder ".", "/srv/openstreetmap-website"

+    vb.customize ["modifyvm", :id, "--memory", "1024"]
+    vb.customize ["modifyvm", :id, "--cpus", "2"]

   end
 
   # use third party image and NFS sharing for lxc
   end
 
   # use third party image and NFS sharing for lxc