Skip to content
Permalink
Browse files

update vagrant configs (#8706)

  • Loading branch information...
trev-dev authored and nightpool committed Sep 16, 2018
1 parent 5aae71c commit 8971bb8cf29ce940345cf306725dd3f71e8ffded
Showing with 11 additions and 5 deletions.
  1. +1 −1 .env.vagrant
  2. +10 −4 Vagrantfile
@@ -1,2 +1,2 @@
VAGRANT=true
LOCAL_DOMAIN=mastodon.dev
LOCAL_DOMAIN=mastodon.local
@@ -85,6 +85,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provider :virtualbox do |vb|
vb.name = "mastodon"
vb.customize ["modifyvm", :id, "--memory", "2048"]
# Increase the number of CPUs. Uncomment and adjust to
# increase performance
# vb.customize ["modifyvm", :id, "--cpus", "3"]

# Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions.
# https://github.com/mitchellh/vagrant/issues/1172
@@ -97,19 +100,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

end

config.vm.hostname = "mastodon.dev"

# This uses the vagrant-hostsupdater plugin, and lets you
# access the development site at http://mastodon.dev.
# access the development site at http://mastodon.local.
# If you change it, also change it in .env.vagrant before provisioning
# the vagrant server to update the development build.
#
# To install:
# $ vagrant plugin install vagrant-hostsupdater
config.vm.hostname = "mastodon.local"

if defined?(VagrantPlugins::HostsUpdater)
config.vm.network :private_network, ip: "192.168.42.42", nictype: "virtio"
config.hostsupdater.remove_on_suspend = false
end

if config.vm.networks.any? { |type, options| type == :private_network }
config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp']
config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp', 'actimeo=1']
else
config.vm.synced_folder ".", "/vagrant"
end

0 comments on commit 8971bb8

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.