diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:49:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:49:18 -0400 |
| commit | ed332693fea75ac5f95351e5cc2627ccfc21eb04 (patch) | |
| tree | cb96d7cd349ebdc93104ec05886d8256467cdaf7 /Vagrantfile | |
| parent | 41a78be25e5b4d7b5f65cfbf4d6fba5184f41475 (diff) | |
| parent | 881e4277fdd5116037a86af3c711d4b6ceb240d4 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 16 |
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 |