diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:46:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:46:36 -0400 |
| commit | e7d7a99fbc78c7dbf763279aa4262580cabd8e1f (patch) | |
| tree | 6f1fce572c176a73aeacffa948c51ca3bf797596 /Vagrantfile | |
| parent | f0d1107c530d43432f2e19a2c74aff6cdfbd2b83 (diff) | |
| parent | 8d27de32b31f1093ab7c6eb177dfb9b866a1203e (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 14 |
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 |