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

Merge pull request #1269 from kewubenduben/master 

No more reboot on first try
This commit is contained in:
Neil Lalonde 2013-08-02 09:25:24 -07:00
parent 8cc49d9797 b89a4f50c5
commit 1f53d5dcac
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Vagrantfile vendored
View File

@ -30,26 +30,20 @@ Vagrant.configure("2") do |config|
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"]
# The first chef run just upgrades the chef installation using omnibus
config.vm.provision :chef_solo do |chef|
chef.binary_env = "GEM_HOME=/opt/vagrant_ruby/lib/ruby/gems/1.8/ GEM_PATH= "
chef.binary_path = "/opt/vagrant_ruby/bin/"
chef.cookbooks_path = chef_cookbooks_path
chef.add_recipe "recipe[omnibus_updater]"
chef.add_recipe "discourse"
chef.json = { :omnibus_updater => { 'version_search' => false }}
end
# The second chef run uses the updated chef-solo and does normal configuration
# 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 "discourse"
end
end