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:21:21 -0400
committerGitHub <noreply@github.com>2017-04-07 22:21:21 -0400
commitfef478781d1033ba045806945f84cbab1bdb0007 (patch)
treecf99ed9130e2226f13e52f87dc7bbe8a9b464ee2 /Vagrantfile
parentbf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (diff)
parentc1a553d2c274941f38cc299699dfae1f60559e67 (diff)
Merge branch 'master' into master
Diffstat (limited to 'Vagrantfile')
-rw-r--r--Vagrantfile16
1 files changed, 14 insertions, 2 deletions
diff --git a/Vagrantfile b/Vagrantfile
index 154d0e895..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,12 +101,14 @@ 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
 
+  config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp']
+
   # Otherwise, you can access the site at http://localhost:3000
   config.vm.network :forwarded_port, guest: 80, host: 3000