mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 23:58:31 -05:00
d2390703b8
On initial load of localhost:4000, the http calls for additional Javascript files via the browser appears to take more than a few minutes with *.js endpoints loading in one file at a time very slowly. It was observed that the Ruby process was consistently pegged at 95% and up. This behaviour is not observed using a Mac OSX. However, adding a single core to the guest OS (from 1 to 2) improved performance considerably. The patch detects if the host system is Mac OSX or Linux and attempts to assign the same number of cores as is present on the host.
65 lines
2.5 KiB
Ruby
65 lines
2.5 KiB
Ruby
# -*- mode: ruby -*-
|
|
# vi: set ft=ruby :
|
|
# See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md
|
|
#
|
|
Vagrant.configure("2") do |config|
|
|
config.vm.box = 'discourse-0.9.9.13'
|
|
config.vm.box_url = "https://d3fvb7b7auiut8.cloudfront.net/discourse-0.9.9.13.box"
|
|
|
|
# Make this VM reachable on the host network as well, so that other
|
|
# VM's running other browsers can access our dev server.
|
|
config.vm.network :private_network, ip: "192.168.10.200"
|
|
|
|
# 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
|
|
# them into the VM.
|
|
config.ssh.forward_agent = true
|
|
|
|
config.vm.provider :virtualbox do |v|
|
|
# This setting gives the VM 1024MB of RAM instead of the default 384.
|
|
v.customize ["modifyvm", :id, "--memory", [ENV['DISCOURSE_VM_MEM'].to_i, 1024].max]
|
|
|
|
# Who has a single core cpu these days anyways?
|
|
cpu_count = 2
|
|
|
|
# Determine the available cores in host system.
|
|
# This mostly helps on linux, but it couldn't hurt on MacOSX.
|
|
if RUBY_PLATFORM =~ /linux/
|
|
cpu_count = `nproc`.to_i
|
|
elsif RUBY_PLATFORM =~ /darwin/
|
|
cpu_count = `sysctl -n hw.ncpu`.to_i
|
|
end
|
|
|
|
# Assign additional cores to the guest OS.
|
|
v.customize ["modifyvm", :id, "--cpus", cpu_count]
|
|
v.customize ["modifyvm", :id, "--ioapic", "on"]
|
|
|
|
# This setting makes it so that network access from inside the vagrant guest
|
|
# is able to resolve DNS using the hosts VPN connection.
|
|
v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
|
|
end
|
|
|
|
config.vm.network :forwarded_port, guest: 3000, host: 4000
|
|
config.vm.network :forwarded_port, guest: 1080, host: 4080 # Mailcatcher
|
|
|
|
nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
|
|
config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", :nfs => nfs_setting
|
|
|
|
config.vm.provision :shell, :inline => "apt-get -qq update && apt-get -qq -y install ruby1.9.3 build-essential && gem install chef --no-rdoc --no-ri --conservative"
|
|
|
|
chef_cookbooks_path = ["chef/cookbooks"]
|
|
|
|
# This run uses the updated chef-solo and does normal configuration
|
|
config.vm.provision :chef_solo do |chef|
|
|
chef.binary_env = "GEM_HOME=/opt/chef/embedded/lib/ruby/gems/1.9.1/ GEM_PATH= "
|
|
chef.binary_path = "/opt/chef/bin/"
|
|
chef.cookbooks_path = chef_cookbooks_path
|
|
|
|
chef.add_recipe "recipe[apt]"
|
|
chef.add_recipe "recipe[build-essential]"
|
|
chef.add_recipe "recipe[vim]"
|
|
chef.add_recipe "recipe[java]"
|
|
chef.add_recipe "recipe[imagemagick]"
|
|
chef.add_recipe "discourse"
|
|
end
|
|
end
|