updated sublime-project & vagrant file

added the "trim_trailing_white_space_on_save setting" so developpers
using sublime text will now trim trailing white space one save

updated the vagrant configuration file so it uses ruby convention
This commit is contained in:
Régis Hanol
2013-02-26 23:12:31 +01:00
parent cd6c1de5b0
commit 1feeeed338
2 changed files with 24 additions and 23 deletions

5
Vagrantfile vendored
View File

@@ -25,8 +25,7 @@ Vagrant::Config.run do |config|
config.vm.forward_port 3000, 4000
config.vm.forward_port 1080, 4080 # Mailcatcher
nfs_setting = (RUBY_PLATFORM =~ /darwin/ or
RUBY_PLATFORM =~ /linux/) ? true : false
nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
config.vm.share_folder("v-root", "/vagrant", ".", :nfs => nfs_setting)
chef_cookbooks_path = ["chef/cookbooks"]
@@ -49,6 +48,6 @@ Vagrant::Config.run do |config|
chef.add_recipe "recipe[apt]"
chef.add_recipe "recipe[build-essential]"
chef.add_recipe "recipe[phantomjs]"
chef.add_recipe "recipe[vim]"
chef.add_recipe "recipe[vim]"
end
end