From 4a9e4b3394b7c164062c9da9848e41556833a6a0 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Wed, 6 Nov 2013 22:08:13 -0200 Subject: [PATCH] Use new base boxes as dev VMs --- development/Vagrantfile | 10 +++++----- development/site.pp | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/development/Vagrantfile b/development/Vagrantfile index 6a2ee9b..804f4e2 100644 --- a/development/Vagrantfile +++ b/development/Vagrantfile @@ -2,16 +2,16 @@ # vi: set ft=ruby : require 'pathname' -BASE_URL = 'http://dl.dropbox.com/u/13510779' -LAST_RELEASE_DATE = '2013-07-12' +BASE_URL = 'http://bit.ly/' +LAST_RELEASE_DATE = '2013-09-28' LOCAL_BOXES_PATH = Pathname('../boxes/output').expand_path def lxc_box_url(release_name) - file_name = "lxc-#{release_name}-amd64-#{LAST_RELEASE_DATE}.box" - local_box_file = LOCAL_BOXES_PATH.join(file_name) + box_name = "vagrant-lxc-#{release_name}-amd64-#{LAST_RELEASE_DATE}" + local_box_file = LOCAL_BOXES_PATH.join("#{box_name}.box") local_box_file.exist? ? local_box_file.to_s : - "#{BASE_URL}/#{file_name}" + "#{BASE_URL}/#{box_name}" end BOXES = { diff --git a/development/site.pp b/development/site.pp index 21757fa..15de070 100644 --- a/development/site.pp +++ b/development/site.pp @@ -146,8 +146,6 @@ file { '/usr/bin/lxc-vagrant-wrapper': ensure => 'present', mode => '0755', - content => " -#!/usr/bin/env ruby -exec ARGV.join(' ') - " + content => "#!/usr/bin/env ruby +exec ARGV.join(' ')" }