Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore NFS shares on darwin & 1024MB in Vagrant.

This commit is contained in:
Elliot Murphy 2013-02-07 20:51:54 -05:00 committed by Neil Lalonde
parent 79dfccf717
commit f28dc6115d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEVELOPMENT.md
View File

@ -20,7 +20,7 @@ When you're ready to start working, boot the VM:
vagrant up vagrant up
``` ```
On Windows, it will prompt you for your admin password. This is so it can mount your local files inside the VM for an easy workflow. Vagrant will prompt you for your admin password. This is so it can mount your local files inside the VM for an easy workflow.
(The first time you do this, it will take a while as it downloads the VM image and installs it. Go grab a coffee.) (The first time you do this, it will take a while as it downloads the VM image and installs it. Go grab a coffee.)

7
Vagrantfile vendored
View File

@ -15,8 +15,8 @@ Vagrant::Config.run do |config|
# them into the VM. # them into the VM.
config.ssh.forward_agent = true config.ssh.forward_agent = true
# This setting gives the VM 512MB of MEMORIES instead of the default 384. # This setting gives the VM 1024MB of MEMORIES instead of the default 384.
config.vm.customize ["modifyvm", :id, "--memory", 512] config.vm.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.
@ -25,5 +25,6 @@ Vagrant::Config.run do |config|
config.vm.forward_port 3000, 4000 config.vm.forward_port 3000, 4000
config.vm.forward_port 1080, 4080 # Mailcatcher config.vm.forward_port 1080, 4080 # Mailcatcher
config.vm.share_folder("v-root", "/vagrant", ".") nfs_setting = RUBY_PLATFORM =~ /darwin/ ? true : false
config.vm.share_folder("v-root", "/vagrant", ".", :nfs => nfs_setting)
end end