Update the Vagrantfile to conform to the latest spec (v1.1).

This commit is contained in:
Jamie Murai 2013-03-18 02:45:51 -04:00 committed by Robin Ward
parent 002fab358b
commit 73b2d6f076

22
Vagrantfile vendored
View file

@ -2,31 +2,33 @@
# vi: set ft=ruby : # vi: set ft=ruby :
# See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md # See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md
# #
Vagrant::Config.run do |config| Vagrant.configure("2") do |config|
config.vm.box = 'discourse-pre' config.vm.box = 'discourse-pre'
config.vm.box_url = 'http://www.discourse.org/vms/discourse-pre.box' config.vm.box_url = 'http://www.discourse.org/vms/discourse-pre.box'
# Make this VM reachable on the host network as well, so that other # Make this VM reachable on the host network as well, so that other
# VM's running other browsers can access our dev server. # VM's running other browsers can access our dev server.
config.vm.network :hostonly, '192.168.10.200' config.vm.network :private_network, ip: "192.168.10.200"
# Make it so that network access from the vagrant guest is able to # Make it so that network access from the vagrant guest is able to
# use SSH private keys that are present on the host without copying # use SSH private keys that are present on the host without copying
# them into the VM. # them into the VM.
config.ssh.forward_agent = true config.ssh.forward_agent = true
# This setting gives the VM 1024MB of MEMORIES instead of the default 384. config.vm.provider :virtualbox do |v|
config.vm.customize ["modifyvm", :id, "--memory", 1024] # This setting gives the VM 1024MB of MEMORIES instead of the default 384.
v.customize ["modifyvm", :id, "--memory", 1024]
# This setting makes it so that network access from inside the vagrant guest # This setting makes it so that network access from inside the vagrant guest
# is able to resolve DNS using the hosts VPN connection. # is able to resolve DNS using the hosts VPN connection.
config.vm.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
end
config.vm.forward_port 3000, 4000 config.vm.network :forwarded_port, guest: 3000, host: 4000
config.vm.forward_port 1080, 4080 # Mailcatcher config.vm.network :forwarded_port, guest: 1080, host: 4080 # Mailcatcher
nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
config.vm.share_folder("v-root", "/vagrant", ".", :nfs => nfs_setting) config.vm.synced_folder ".", "/vagrant", :nfs => nfs_setting
chef_cookbooks_path = ["chef/cookbooks"] chef_cookbooks_path = ["chef/cookbooks"]