logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: acf10a2c8734d73e1864ed69be43f5f3167799af
parent: cd77c75d6cca50b8ec9d0ae31bd1249ae6b64ef9
Author: Eugen <eugen@zeonfederated.com>
Date:   Thu,  6 Apr 2017 22:58:44 +0200

Merge pull request #1103 from alimony/vagrant-tweaks-01

Add a couple of network performance tweaks to Vagrantfile.

Diffstat:

MVagrantfile14++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)

diff --git 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