diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:13:06 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:13:06 -0400 |
commit | cf13c97cb2890d7bf51540f632cf725f89baefd9 (patch) | |
tree | d58925eed77815140c011bb70667fdc4b80173c5 /Vagrantfile | |
parent | 65b3a2a5a6e3151cf4da89132326b796a5c0687a (diff) | |
parent | 90a408f5927956f0cbe9b81812daca7b4a92d807 (diff) |
Merge branch 'master' into master
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 |