diff -r dc75c8d65289 -r fa66f4bb1563 dev/Vagrantfile --- a/dev/Vagrantfile Fri Mar 14 10:03:37 2014 +0100 +++ b/dev/Vagrantfile Fri Mar 14 13:16:10 2014 +0100 @@ -5,7 +5,7 @@ custom_file_path = File.join(__dir__, (ENV['SYSCONFIG'] || 'custom.yaml')) -context = File.exist?(custom_file_path)?YAML::load_file(custom_file_path):{} +context = (File.exist?(custom_file_path)?YAML::load_file(custom_file_path):{}) || {} ROOT_PATH = context.fetch("root_path","../") @@ -18,11 +18,11 @@ # please see the online documentation at vagrantup.com. # Every Vagrant virtual environment requires a box to build off of. - config.vm.box = "wheezy-73-x64" + config.vm.box = context.fetch("vm_box","wheezy-73-x64") # The url from where the 'config.vm.box' box will be fetched if it # doesn't already exist on the user's system. - config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box" + config.vm.box_url = context.fetch("vm_box_url","http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box") # Create a forwarded port mapping which allows access to a specific port # within the machine from a port on the host machine. In the example below,