about summary refs log tree commit diff
path: root/Vagrantfile
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 22:53:42 -0400
committerGitHub <noreply@github.com>2017-04-07 22:53:42 -0400
commit3c5b0c55cb0dacc8471bcab98147dc86d5df12ed (patch)
treed9debdce95dec993c4e69bf966876c3775db59ea /Vagrantfile
parent8a4ff30ceb4a81a215c1aebf404dd8776fde3c02 (diff)
parent0dcf3c6abebfab4619f8c47785e821abe339dba1 (diff)
Merge branch 'master' into master
Diffstat (limited to 'Vagrantfile')
-rw-r--r--Vagrantfile14
1 files changed, 12 insertions, 2 deletions
diff --git a/Vagrantfile b/Vagrantfile
index b93ec9fa2..cd7f74473 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -84,6 +84,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider :virtualbox do |vb|
     vb.name = "mastodon"
     vb.customize ["modifyvm", :id, "--memory", "1024"]
+
+    # Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions.
+    # https://github.com/mitchellh/vagrant/issues/1172
+    vb.customize ["modifyvm", :id, "--natdnsproxy1", "off"]
+    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off"]
+
+    # Use "virtio" network interfaces for better performance.
+    vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
+    vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
+
   end
 
   config.vm.hostname = "mastodon.dev"
@@ -91,9 +101,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # This uses the vagrant-hostsupdater plugin, and lets you
   # access the development site at http://mastodon.dev.
   # To install:
-  #   $ vagrant plugin install hostsupdater
+  #   $ vagrant plugin install vagrant-hostsupdater
   if defined?(VagrantPlugins::HostsUpdater)
-    config.vm.network :private_network, ip: "192.168.42.42"
+    config.vm.network :private_network, ip: "192.168.42.42", nictype: "virtio"
     config.hostsupdater.remove_on_suspend = false
   end